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

7354 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
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
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
Cheridan
2420e43d1d Merge pull request #16671 from bgobandit/copydocs 
Secret documents can now be copied.
 2016-04-07 13:00:57 -05:00
Cheridan
96bf1d1f74 Merge pull request #16686 from ChangelingRain/medwrench 
Adds the Medical Wrench
 2016-04-07 11:41:34 -05:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03: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
Nerd Lord
b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04: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
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
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
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
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
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
Cheridan
591aacfcc5 Merge pull request #16527 from ChangelingRain/thisiskorsfault 
Fixes minerals not spreading
 2016-04-04 18:20:21 -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
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
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
bgobandit
dc9c725e41 Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt. 2016-04-04 02:13:33 -04:00
KorPhaeron
4a43bdbfda Merge pull request #16589 from psykzz/patch-1 
Suicide messages
 2016-04-03 22:01:30 -05: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
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
bgobandit
6e52bef680 Alt-clicking a fire extinguisher cabinet opens/closes it. 2016-04-03 07:11:53 -04:00
bgobandit
73bb67a1ea typo 2016-04-03 07:02:59 -04:00
xxalpha
d6301ff735 Cigarette packs will brand their cigarettes. 
an

the macros dont work
 2016-04-03 10:42:53 +01:00
bawhoppen
af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Joan Lung
c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets 
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
 2016-04-03 13:41:45 +10:00
Matt Smith
70040af586 Suicide messages 2016-04-03 01:51:46 +01:00
Remie Richards
a3dd455a37 Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg 2016-04-02 20:52:00 +01:00
Lzimann
cb867fe314 Adds a new proc so multiple atoms can be watched for movement 2016-04-02 16:33:56 -03:00
bgobandit
5e3727a85f Minor knife changes. 2016-04-02 03:40:26 -04:00
Lzimann
b587496058 Fix locker stuffing 2016-04-02 00:02:50 -03:00
KorPhaeron
efe5ec8dbc Merge pull request #16500 from erwgd/SpearIntoLathe 
Cable restraints and spears can be recycled in autolathe, but not zipties
 2016-04-01 20:47:16 -05:00
Nerd Lord
7d5dce7e10 this, on the other hand, is byond's fault 2016-04-01 20:10:07 -04:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
duncathan salt
0f04ea79a0 Merge pull request #16401 from Tytynguyen/atmosrounding 
Atmospheric readings are now accurate to 0.01%
 2016-03-31 12:04:48 -06:00