cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,725 Commits 61 Branches 14 Tags
f54e2bee2bcbb2216e0935ce921105ec383adcca
Commit Graph

9862 Commits

Author SHA1 Message Date
WJohn
cf921dec58 Merge pull request #10163 from RemieRichards/TableCraftingUnFucking 
Table Crafting Update
 2015-07-01 14:29:55 -04:00
Razharas
ce02df75f8 Merge pull request #10285 from Ikarrus/gangimplantmania 
Gang Update: Implants Edition
 2015-07-01 18:43:21 +03:00
Jordie0608
3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi
 2015-07-01 19:41:00 +10:00
Swag McYolosteinen
f7c7faad06 Merge pull request #10291 from RemieRichards/get_apc()-NotShitVersion 
Fixes get_apc() being shit
 2015-07-01 10:33:12 +02:00
Remie Richards
cd36b1665b Merge pull request #10202 from nullstation/hi-extended 
HTML interface module: Port of the crew monitoring computer
 2015-07-01 05:59:39 +01:00
phil235
782fdd7678 Merge pull request #10259 from Razharas/DemonFix 
Fixes dummy objects being rightclick visible
 2015-06-30 23:04:30 +02:00
Cheridan
3329970b55 Merge pull request #10266 from phil235/SpaceDrugOverdoseTweak 
Tweaks space drug overdose and space drug blob effect.
 2015-06-30 11:02:15 -05:00
Remie Richards
d9ec8a1008 area/proc/get_apc() is no longer shit and does not lag (AT ALL) on large areas anymore, the new method stores a list of all APCs in the world, and checks if their area var is equal to the area get_apc() was called on. 2015-06-30 12:20:28 +01:00
Ikarrus
1e30fc4b6c Gang Update: Implants Edition 
- Multiple gang leaders are spawned at round start, the number which depends on server population
- Only one boss per gang, the rest are lieutenants
- Only the gang boss can recall the shuttle
- Gangsters can no longer be promoted mid-game.
- Security can once again deconvert gangsters with loyalty implants
  - A message is shown if the deconversion destroys the implant in the process

- Added an Implant Breaker item to the gangtool as a purchasable item for 10 influence each
  - They are a one-use item that destroys all implants in the target, including loyalty implants
  - They will also attempt to recruit the target before destroying itself
  - As this is an implanter it requires the target to remain still for a few seconds to administer it
- Implanters no longer work if the target is wearing headgear. Remove them first

- Added help text whenever you buy certain items from the gangtool
- Spare gangtools now cost 30 influence for everyone
  - They no longer give you a free pen
- Increases domination limit back to 3
- Purchased outfits are automatically equipped in your hand, if possible
- Gang boss has a 3 minute window at round start to select an outfit style. If he doesn't select one, the his lieutenants may pick one. No gang outfits can be created without a style picked first.
  - This is just to give the gang boss the first opportunity to pick an outfit style for his gang
- You can now see how many outfits your gangtool has in stock
- Outfits are no longer used up if you cancel the style selection prompt
- Loyalty implant destruction message has been moved to its Destroy()
 2015-06-29 23:50:06 -06:00
Cheridan
3fe48e2f26 Merge pull request #10248 from optimumtact/patch-6 
log simple animal attacks to attack log
 2015-06-29 23:03:12 -05:00
Cheridan
604bcdef68 Merge pull request #10206 from Dorsisdwarf/smokeforyourhp 
Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine.
 2015-06-29 22:20:51 -05:00
Cheridan
1368794705 Merge pull request #10112 from Ikarrus/whyamiinspace 
Reactive Teleport Armor can teleport the user to space tiles again
 2015-06-29 22:11:03 -05:00
Cheridan
d36c01412f Merge pull request #10238 from Incoming5643/catgirls2015 
Catgirls 2015
 2015-06-29 21:44:39 -05:00
Cheridan
87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks 
Destructible Clothing Tweaks and Fixes
 2015-06-29 21:38:20 -05:00
Cheridan
3b4dbc4f27 Merge pull request #10216 from nukeop/syndiesurgerybag 
Add Syndicate surgery bag to uplink
 2015-06-29 15:52:55 -05:00
Dorsisdwarf
1f2e672f24 Remember kids: Smoking makes you RUGGED 2015-06-29 21:36:16 +01:00
Swag McYolosteinen
47b1deb528 Merge pull request #10204 from Razharas/VarEdit 
Some varedit improvements
 2015-06-29 19:18:28 +02:00
phil235
588c12ee22 Merge pull request #10219 from xxalpha/mouthgag 
Fixed not being able to eat with adjusted masks.
 2015-06-29 18:23:56 +02:00
phil235
f1cd3069ad Tweaks space drug overdose and space drug blob effect. 2015-06-29 18:05:39 +02:00
phil235
a8bc78e16e Merge pull request #10125 from Iamgoofball/patch-85 
Buffs the traitor toxins
 2015-06-29 17:36:11 +02:00
phil235
a39effd14c Merge pull request #10193 from Cheridan/what_a_fluke 
Suit Sensor Fixes
 2015-06-29 17:32:44 +02:00
Razharas
8a26ff2527 Fixes dummy objects being rightclick visible 
Fixes dummy objects being rightclick visible
 2015-06-29 15:38:39 +03:00
Razharas
eb4d6c66a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into VarEdit 2015-06-29 13:42:23 +03:00
Jordie
f0d4dda9e1 Merge pull request #10218 from optimumtact/patch-3 
Jetpack speed changes
 2015-06-29 15:01:53 +10:00
Orange Borg
77a77dd107 Jetpack speed changes [DNM] 
being in zero grav now gives a -1 speedup (as if you had gottagofast)
being in zero grav with a jetpack gives -2 (gottagoreallyfast)

The gottagofast and gottagoreallyfast flags only apply in gravity situations now
 2015-06-29 15:30:55 +12:00
Orange Borg
efcd5f3f75 log simple animal attacks to attack log 2015-06-29 15:24:34 +12:00
Ikarrus
4dbb5feb2d If ex_act(2) is softened by armor, shredding chance gets halved 2015-06-28 20:29:13 -06:00
Ikarrus
4f4b8f1774 Merge branch 'master' of https://github.com/tgstation/-tg-station into burntweaks 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
 2015-06-28 19:00:16 -06:00
Ikarrus
48dedda36b ABSTRACT items cannot be shredded 2015-06-28 18:55:34 -06:00
Incoming5643
2c9401fbc0 Whoops almost killed the miners with cats 2015-06-28 19:44:44 -04:00
Cheridan
5fc029d63d Merge pull request #10215 from Ikarrus/freetheclothes 
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
 2015-06-28 18:16:04 -05:00
xxalpha
0ab6b99658 Flag cleaning. 2015-06-29 00:08:49 +01:00
Cheridan
6c0a930cfb Merge pull request #10173 from Incoming5643/coding_stupid_shit_is_my_antidrug 
Rainbow slimes finally obtainable
 2015-06-28 18:01:30 -05:00
xxalpha
47f3d802f6 Fixed not being able to eat with adjusted masks and helmets. 2015-06-28 23:51:55 +01:00
nullquery
6453882e37 Merge pull request #10 from nullstation/master 
Merge with upstream
 2015-06-28 23:03:23 +02:00
NullQuery
c694febb77 Minimap support for the crew monitoring computer. 2015-06-28 23:00:39 +02:00
Incoming
bb8471ad3b Adds a catgirls version of cursed items 
Apologizes for nothing
:3
 2015-06-28 15:27:01 -04:00
Ikarrus
d07e315ddf Squashed 2015-06-28 12:11:05 -06:00
Ikarrus
c08cfb8018 Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf 
Conflicts:
	code/game/gamemodes/gang/recaller.dm
 2015-06-28 08:30:00 -06:00
phil235
c1a37bb2e0 Derp, I hate fixing merge conflicts... 2015-06-28 15:27:58 +02:00
phil235
e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix 
Conflicts:
	code/modules/clothing/masks/gasmask.dm
 2015-06-28 15:22:21 +02:00
Razharas
98c2bd18db Merge pull request #9620 from xxalpha/mineralcontainer 
Fixed banana shoes mineral handling.
 2015-06-28 15:07:17 +03:00
barackobama
7dfcc292b7 add a variable to mmi to indicate if it's of the syndicate variety as 
suggested
 2015-06-28 12:44:25 +01:00
Cheridan
f534e3c0ec Merge pull request #10200 from Jordie0608/whoevenusesthese 
Fixes Cheridan being a dork
 2015-06-28 02:27:33 -05:00
nullquery
a6ce6abfe3 Merge pull request #8 from nullstation/master 
Merge with upstream
 2015-06-28 07:09:40 +02:00
barackobama
0316a836cb add a Syndicate surgery dufflebag full of tools to the uplink 
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
 2015-06-28 02:54:49 +01:00
Razharas
1a5be75225 Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner 
Admin help tweaks.
 2015-06-28 02:55:53 +03:00
MrStonedOne
9a64d1db9e Removes duplicate variable in adminhelp. 2015-06-27 16:49:39 -07:00
Ikarrus
8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets 
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
 2015-06-27 17:22:02 -06:00
MrStonedOne
d9da2290e8 Cleans up adminhelp keyword searcher and changelog for #10196. 2015-06-27 13:03:47 -07:00