cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,434 Commits 61 Branches 14 Tags
022d9e573fd80db94a1507a9db6c052d7c7fe8e0
Commit Graph

14240 Commits

Author SHA1 Message Date
TrustyGun
022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
TrustyGun
927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
KorPhaeron
7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements 
New Engineering Crates, Shuttle Loan fix
 2016-04-07 21:28:29 -05:00
KorPhaeron
35399d6d0c Merge pull request #16690 from lzimann/revert-16570-patch-182 
Revert "Smooth movement"
 2016-04-07 16:41:47 -05:00
Razharas
a8890b264a Merge pull request #16563 from lzimann/lockerfix 
Fix a bug with stuffing people into lockers.
 2016-04-08 00:00:22 +03:00
Razharas
89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS 
Asteroid fixes
 2016-04-07 23:52:37 +03:00
Joan Lung
ab129c57c6 Merge pull request #16689 from KorPhaeron/survival_pod 
New Survival Pods
 2016-04-07 16:03:03 -04:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
AnturK
830f337c66 Merge pull request #16607 from KorPhaeron/mecha3 
Mecha Changes
 2016-04-07 20:10:01 +02:00
Cheridan
2420e43d1d Merge pull request #16671 from bgobandit/copydocs 
Secret documents can now be copied.
 2016-04-07 13:00:57 -05:00
KorPhaeron
299a475c67 Fixes thrown deflection chances 2016-04-07 12:51:42 -05:00
Cheridan
96bf1d1f74 Merge pull request #16686 from ChangelingRain/medwrench 
Adds the Medical Wrench
 2016-04-07 11:41:34 -05:00
Joan Lung
7fafdece03 Merge pull request #16656 from Core0verload/patch-1 
IV Drip now works with mutantraces reagent blood
 2016-04-07 11:15:16 -04:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
KorPhaeron
c074a5b673 Mecha Armour Facings 2016-04-06 19:08:56 -05:00
Leo
ac585e53ec Revert "Smooth movement" 2016-04-06 18:59:56 -03:00
Remie Richards
b80d9c9285 Adds accreditation for myself because I forgot to and it's fine to credit yourself when it's like a mini-system thing instead of just like one line fixes gosh. 2016-04-06 21:28:01 +01:00
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances 
Conflicts:
	code/game/atoms.dm
 2016-04-06 21:26:46 +01:00
Cheridan
0c5151a09e Merge pull request #16502 from Robustin/population 
Reduces min. pop. for NukeOps and Cult
 2016-04-06 13:41:41 -05:00
Cheridan
38b0aa8bab Merge pull request #16570 from MrStonedOne/patch-182 
Smooth movement
 2016-04-06 13:31:12 -05:00
AnturK
2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain 
Adds on_species_gain proc to human species
 2016-04-06 20:18:15 +02:00
Nerd Lord
b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04:00
duncathan salt
11966e5508 Merge pull request #16660 from MrStonedOne/patch-186 
[ready]Makes SSair's initialize() faster.
 2016-04-06 10:39:04 -06:00
KorPhaeron
c142407115 Merge pull request #16681 from Core0verload/spaceicon 
Space, once again, has an icon in map editor
 2016-04-06 09:16:20 -05:00
Razharas
d677bc055b Merge pull request #16674 from optimumtact/signspointtono 
Keep pixel offsets when changing sign type
 2016-04-06 15:06:08 +03:00
MrStonedOne
546148cb33 Makes atmos init much much much much much faster. 2016-04-06 04:25:04 -07:00
c0
3fdca952d2 Space, once again, has an icon in map editor 2016-04-06 12:40:52 +03:00
c0
feb6c6bdf3 Asteroid fixes 2016-04-06 11:39:45 +03:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework 
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
 2016-04-06 02:15:25 -06:00
bgobandit
35cf1071cd honk 2016-04-05 22:14:05 -04:00
oranges
aed000580c Keep pixely layout when changing sign type 
This stops signs realigning to your turf when you go to change the sign
type.

Also slight sanity check for adjacency after user uses pen
 2016-04-06 14:02:47 +12:00
Cheridan
05d5029b06 Merge pull request #16634 from erwgd/SusVendSurvival 
Adds internals and coffee to sustenance vendor's contraband stock
 2016-04-05 19:29:30 -05:00
KorPhaeron
32db04a8bd Merge pull request #16632 from erwgd/VendMoreKnives 
Kitchen vendor stores 3 more knives
 2016-04-05 18:48:23 -05:00
KorPhaeron
55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff 
Simple Animal ranged cooldowns now use world.time
 2016-04-05 18:45:48 -05:00
bgobandit
94fe7ef642 Secret documents can now be copied. 2016-04-05 19:00:21 -04:00
Cheridan
b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone 
Gives the clown a megaphone.
 2016-04-05 15:35:36 -05:00
AnturK
4d0d0178ae Merge pull request #16666 from duncathan/nopressurebro 
fixes atmos pressure chambers having no pressure
 2016-04-05 21:55:56 +02:00
AnturK
3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183 
Better sleep()s for procs that abuse it
 2016-04-05 21:03:30 +02:00
duncathan
a292e75877 fixes atmos pressure chambers having no pressure 2016-04-05 12:48:22 -06:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
AnturK
abe689cac9 Merge pull request #16587 from xxalpha/cigbrand 
Cigarette packs will brand their cigarettes.
 2016-04-05 19:59:09 +02:00
duncathan salt
f405096258 Merge pull request #16659 from MrStonedOne/airfixes 
Final stage of fixes for space getting gas.
 2016-04-05 11:52:02 -06:00
Cheridan
5c1beb9232 Merge pull request #16622 from KorPhaeron/plating 
Fixes plasteel tiles+lavaland floors
 2016-04-05 11:53:46 -05:00
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
663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
MrStonedOne
fd70645f43 Final stage of fixes for space getting gas. 
There might be some other edge cases, but this should get most of them now.
 2016-04-05 08:27:04 -07:00
Core0verload
9b14bfaed7 IV Drip now works with mutantraces reagent blood 2016-04-05 14:31:33 +03: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
9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00
Nerd Lord
8038c4dd33 Simple Animal ranged cooldowns now use world.time 
this might fuck stuff up but ~oh well~
 2016-04-04 19:59:59 -04:00