cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,702 Commits 61 Branches 14 Tags
332bde0f4f5809398ece37b4acd6cdc6de2fc9fa
Commit Graph

1749 Commits

Author SHA1 Message Date
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
tkdrg
83b9ed8e18 Merge pull request #14433 from bgobandit/fixuno 
Windows now give a message when repaired.
 2016-01-07 03:18:48 -03:00
KorPhaeron
cf537737a1 Closets 2016-01-06 12:39:07 -06:00
bgobandit
b1dbe47bbf Windows give a message when repaired. 2016-01-06 01:30:19 -05:00
SouDescolado
3b257854f0 Merge pull request #1 from tgstation/master 
Merge shit
 2016-01-05 14:44:37 -02:00
SouDescolado
92b3c84a22 Make the code beautiful 
Less lines, same code.

Trying to fix merge conflict.

Gah
 2016-01-05 14:36:39 -02:00
Aranclanos
a9ef05807e Merge pull request #14362 from Bawhoppen/czechbarmanhelp 
Gives barman back his new gear
 2016-01-05 04:52:21 -03:00
duncathan salt
9a18bf56fc Merge pull request #14341 from phil235/CremationRuntimeFix 
Fixes runtime when trying to cremate cockroach
 2016-01-04 20:23:49 +01:00
Lularian
cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
bawhoppen
3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -06:00
Lularian
f5bc4b6b4f woops 2016-01-03 17:50:20 -06:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
phil235
78295d8238 Fixes runtime when trying to cremate an animal that deletes itself upon death (mouse, cockroach). 2016-01-03 18:11:18 +01:00
Lularian
5931214cf7 did i duck it up 2016-01-03 00:20:18 -06:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
tkdrg
7717aa27d1 Merge pull request #14244 from AnturK/tubefix 
Fixes diagonal transit tube flipping
 2016-01-02 13:50:32 -03:00
tkdrg
e28576b1ce Merge pull request #14207 from KorPhaeron/spike 
Meat spiking someone removes the grab from your hand
 2016-01-01 16:32:56 -03:00
AnturK
1cdafe8a1d Fixes transit tube flipping 2016-01-01 13:39:43 +01:00
Cheridan
cb27e966eb Merge pull request #14144 from TheRealGLH/electric_chair 
Containment fields and electric chairs now use electrocute_act
 2015-12-31 19:01:52 -06:00
bawhoppen
3f5101d84d oops? 2015-12-31 16:39:28 -06:00
Lularian
8e8526fd14 did I do it mum 2015-12-31 16:37:22 -06:00
KorPhaeron
7fd33d23a5 Meat spike 2015-12-31 12:50:05 -06:00
TheRealGLH
9cb962cbc1 removes argument that did not need to be specified 2015-12-30 09:34:42 +01:00
TheRealGLH
d7097594ff removes the burn_skin proc 
removes the burn_skin proc
 2015-12-29 13:48:38 +01:00
Martijn Daniels
a7865bd9cf electrocute_act 
Changes containment field and electric chair effects to use
electrocute_act
 2015-12-29 13:36:16 +01:00
tkdrg
2d990ea834 Merge pull request #14076 from RemieRichards/VehicleFramework 
Simple Vehicle Framework
 2015-12-28 19:41:59 -03:00
tkdrg
e88bf4e2b5 Merge pull request #14084 from MrStonedOne/GOOOOOF 
Upgrades do_after and progress bars.
 2015-12-28 14:35:34 -03:00
tkdrg
f6db2f4ac9 Merge pull request #14067 from AnturK/mulecratefix 
Fixes mulebot crates
 2015-12-27 14:21:47 -03:00
MrStonedOne
5f68bedcd1 Upgrades do_after and progress bars 2015-12-26 21:04:19 -08:00
Remie Richards
bd22fc8c6d Converted janicarts into a simple to use vehicle framework with customisable speed, converted all existing vehicles to the new framework, added a atv type with a turret on it. 2015-12-26 22:54:15 +00:00
AnturK
af70509257 Fixes mulebot crates 2015-12-26 17:24:16 +01:00
KorPhaeron
64bc7ee1e1 Detective starts with his bowman on 2015-12-25 02:14:19 -06:00
tkdrg
130a4e0242 Merge pull request #13877 from LanCartwright/thesethingsdontgrowontreesyouknow 
Removes Bulldogs from roundstart syndicate ship
 2015-12-24 22:21:55 -03:00
Akke
5821dd81ad we dont have a shotgun tree you know 2015-12-21 13:37:31 +00:00
Incoming
1e7fcd3e9f unbricks the rpgloot event. 
fixes a rare issue with the imposter event.
 2015-12-20 01:15:03 -05:00
tkdrg
3d75589f02 Merge pull request #13689 from KorPhaeron/volcanic_rocks 
Volcanic Rocks
 2015-12-18 03:27:02 -03:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
MMMiracles
cde4df61ae conFLICTS 2015-12-16 06:26:54 -05:00
Jordie
b8925a1b49 Merge pull request #13621 from xxalpha/airlox 
Added maintenance glass airlock and external glass airlock.
 2015-12-16 21:34:24 +11:00
KorPhaeron
571d30a25c Volcanic rocks 2015-12-15 23:31:14 -06:00
MMMiracles
392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
MMMiracles
d07f300063 i did things 2015-12-15 16:46:24 -05:00
xxalpha
e9e4ff735d Added maintenance glass airlock and external glass airlock. 2015-12-14 00:48:01 +00:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
KorPhaeron
0ece383776 Fixes girders on low layer 2015-12-11 02:29:46 -06:00
MMMiracles
f222dfe36e mostly final changes, wowzers 2015-12-08 21:20:31 -05:00
MMMiracles
c384aae4c3 more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM 2015-12-08 00:43:53 -05:00
MMMiracles
6c685d6d67 wew 2015-12-06 02:14:26 -05:00
MMMiracles
8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 
Conflicts:
	icons/mob/animal.dmi
 2015-12-04 18:55:10 -05:00
MMMiracles
6ac96194ba snow stuff. 2015-12-04 18:52:17 -05:00