cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,274 Commits 61 Branches 14 Tags
90cb067020de85543e65a1c80982cd4262cfdc4e
Commit Graph

25756 Commits

Author SHA1 Message Date
Cheridan
90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan
15e66ce517 Merge pull request #16630 from AnturK/gorilla_warfare 
Monkeys can now use all guns without restrictions.
 2016-04-05 11:24:58 -05:00
KorPhaeron
91255b25e2 Merge pull request #16623 from TechnoAlchemisto/explore_this_fam_unzips_pickaxe 
Lets pickaxes be held in explorer suits.
 2016-04-05 11:11:51 -05:00
KorPhaeron
f0bb212355 Merge pull request #16658 from ChangelingRain/hahawhoops 
Fixes support holo beacon teleportation not working under most conditions
 2016-04-05 11:09:11 -05:00
Cheridan
663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
Nerd Lord
e57492a77e Fixes support holo beacon teleportation not working under most conditions 2016-04-05 09:15:02 -04:00
Cheridan
fa6655d18c Merge pull request #16604 from ChangelingRain/zombotron 
Zombies can no longer remove more than one airlock at once
 2016-04-04 23:29:09 -05:00
duncathan salt
1cf07c2445 Merge pull request #16561 from MrStonedOne/ssairtweaks 
Tweaks atmos: excited groups and ssair
 2016-04-04 20:54:37 -06:00
Cheridan
6037e82c47 Merge pull request #16606 from MrStonedOne/patch-184 
Makes the mc shit on dynamic wait subsystems a bit less
 2016-04-04 21:53:32 -05:00
Cheridan
28092ea3a6 Merge pull request #16567 from bear1ake/GRJ-job.title 
Fixes Give Random (Head) Job
 2016-04-04 21:27:43 -05:00
KorPhaeron
a6cd496c95 Merge pull request #16521 from erwgd/StorageEnhance 
Exosuit and utility belt enhancements, holster description change
 2016-04-04 20:57:03 -05:00
KorPhaeron
268d29af45 Merge pull request #16605 from TechnoAlchemisto/Pocket_Scanner 
Makes detective scanners fit inside pockets.
 2016-04-04 20:55:38 -05:00
KorPhaeron
9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00
Cheridan
2a4b304df8 Merge pull request #16601 from ChangelingRain/guardedbalance 
Holoparasite balance
 2016-04-04 18:38:31 -05:00
Cheridan
64c6143e22 Merge pull request #16551 from ChangelingRain/alwaysuseprotectors 
Adds protector holoparasites to traitor
 2016-04-04 18:22:30 -05:00
Cheridan
591aacfcc5 Merge pull request #16527 from ChangelingRain/thisiskorsfault 
Fixes minerals not spreading
 2016-04-04 18:20:21 -05:00
Cheridan
176b762824 Merge pull request #16593 from Core0verload/min_players 
Adds min_players to swarmer, revenant and slaughter demon spawns
 2016-04-04 18:14:47 -05:00
Cheridan
4f4a52e206 Merge pull request #16583 from KorPhaeron/rd_fix 
Fixes RD machine speed
 2016-04-04 18:07:22 -05:00
Cheridan
3f5efd3ca3 Merge pull request #16576 from bgobandit/dumpslikeatrucktrucktruck 
Crowbarring a depowered SSU now properly dumps its contents.
 2016-04-04 18:04:33 -05:00
Cheridan
d5a0f12ae3 Merge pull request #16438 from Bawhoppen/imrunningoutofnamesforbranches 
A few new maint lootspawner additions
 2016-04-04 18:02:57 -05:00
Cheridan
b271395b06 Merge pull request #16573 from bgobandit/carrotrobustness 
Minor knife changes.
 2016-04-04 17:47:09 -05:00
Cheridan
866c418f78 Merge pull request #16592 from bgobandit/ocd 
Alt-clicking a fire extinguisher cabinet opens/closes it.
 2016-04-04 17:43:37 -05:00
MrStonedOne
e514eb0f36 fixes some bugs with excited groups and ssair under duncmos 2016-04-04 14:22:41 -07:00
MrStonedOne
363f848bc8 Tweaks atmos: excited groups and ssair 
Excited groups will be much more aggressive about averaging out their turfs when air movement within has slowed down.
Excited groups will be less aggressive about sleeping simi-idle turfs to prevent deadlocking
Sleeping thresholds lowered.
SSair will now tick_check all loops, not just active turf processing.
 2016-04-04 14:22:40 -07:00
duncathan salt
26df895cda Update space_mixture.dm 2016-04-04 11:32:58 -06:00
AnturK
b1f9fa649f Monkeys can now use all guns without restrictions. 2016-04-04 18:15:33 +02:00
Nerd Lord
d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
KorPhaeron
01daa04d69 Outdoors check 2016-04-04 04:15:04 -05:00
KorPhaeron
0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
TechnoAlchemist
1d96a76eba Lets picks be held in explorer suits. 2016-04-04 01:41:14 -07:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Cheridan
cf4ffc2781 Merge pull request #16026 from duncathan/turfs 
[REVIEW-READY] removes simulated turfs (and asteroid station)
 2016-04-04 01:49:45 -05:00
duncathan
2b01727034 dumb; this is dumb; i am dumb; 2016-04-04 00:40:30 -06:00
duncathan
700bd10678 fixes plasma hanging out in space; removes debug messages 2016-04-04 00:32:40 -06:00
duncathan
7751f41d25 fixes compilation warnings; speeds up roundstart init a bit 2016-04-03 22:59:28 -06:00
KorPhaeron
135ceb2b64 Buffs OOC ban 
* Buffs OOC ban

* Buffs OOC ban
 2016-04-03 22:39:52 -05:00
KorPhaeron
4a43bdbfda Merge pull request #16589 from psykzz/patch-1 
Suicide messages
 2016-04-03 22:01:30 -05:00
TechnoAlchemist
40daf9ec34 fixes the tricord recipe because I cannot into spelling. 2016-04-03 19:32:38 -07:00
PKPenguin321
d098b2594f you cant hide from me you little shit 2016-04-03 18:57:32 -07:00
PKPenguin321
dbcb729f2a fixes a godawful message 
jesus christ who wrote this garbage
 2016-04-03 18:56:14 -07:00
KorPhaeron
2d41f26541 Merge pull request #16515 from TechnoAlchemisto/spoof_chem 
Re-adds the recipes for Kelotane, Bicardine, Antitoxin, and Tricordazine.
 2016-04-03 20:31:18 -05:00
Kyle Spier-Swenson
327a071a06 Makes the mc shit on dynamic wait subsystems a bit less 
So before, a subsystem with dynamic wait enabled, when paused mid run, would have to wait ss.wait until it could resume its run. Where as normally subsystems in these cases get resumed within 3 byond ticks, in most cases, only 1 byond tick.

This makes it so the subsystem resumes next tick, like normal subsystems, but only after every other subsystem has been checked once to see if they need to run, and ran if that's the case. so basically low priority
 2016-04-03 18:09:19 -07:00
TechnoAlchemist
32d3c82371 Makes detective scanners fit inside pockets. 2016-04-03 17:37:48 -07:00
Nerd Lord
0cabcdd673 Zombies can no longer remove more than one airlock at once 2016-04-03 20:34:18 -04:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
Cheridan
e1b7477857 Merge pull request #16579 from KorPhaeron/buffs_ignore 
Ignore Buffs
 2016-04-03 18:39:29 -05:00
Nerd Lord
aa4a46e9de I'm awful at this sort of math! 2016-04-03 19:34:55 -04:00
Nerd Lord
89c9e6a3d3 flash 2016-04-03 19:01:38 -04:00
Nerd Lord
1f191b07ec visible memessage 2016-04-03 18:41:57 -04:00
Nerd Lord
e6abb95178 Holoparasite balance 2016-04-03 18:33:20 -04:00