cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,627 Commits 61 Branches 14 Tags
d78936e18453a6fd7616ea2fd119e9beba8a52da
Commit Graph

1790 Commits

Author SHA1 Message Date
tkdrg
0ff42cb218 Merge pull request #14962 from Boredone/ReRadioactiveArmor 
Radioactive Teleport Armor
 2016-01-30 00:27:13 -03:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
tkdrg
45659129d3 Merge pull request #14919 from KorPhaeron/remove_grab10 
Removes grab from bins
 2016-01-28 20:24:59 -03:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Boredone
c025c3c243 This commit switchs the teleport armor in the RD's Locker to the reactive/teleport child which causes radiation. 2016-01-27 01:47:24 -07:00
duncathan salt
42464d9003 Merge pull request #14875 from neersighted/morgue 
Morgue slabs should forceMove()
 2016-01-26 01:58:03 -06:00
KorPhaeron
d42ddbefe1 Remove Grab 2016-01-25 21:42:19 -06:00
duncathan salt
9bff1722bb Merge pull request #14873 from KorPhaeron/remove_grab1 
Removes grab from closets
 2016-01-25 19:27:21 -06:00
Bjorn Neergaard
e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
Bjorn Neergaard
68e1269ea7 Repath thank dispensers; fix ASSteroid station; repath SSU ract 2016-01-25 12:03:13 -06:00
Bjorn Neergaard
87642fa588 tgui tank dispensers 2016-01-25 12:03:06 -06:00
Bjorn Neergaard
2f2c4a05c4 Morgue slabs should forceMove() 
Fixes #14841
 2016-01-24 19:43:54 -06:00
KorPhaeron
6e4319d182 Removes grab from closets 2016-01-24 19:30:47 -06:00
duncathan salt
10788ec515 Merge pull request #14785 from AnturK/aicardgui 
Adds AI card tgui
 2016-01-24 10:53:34 -06:00
AnturK
9e8eca56a7 Adds AI card tgui 
Removes the multiple AI's on one card semi feature.
 2016-01-24 12:52:31 +01:00
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
xxalpha
638a47d4ac Merge remote-tracking branch 'upstream/master' into smoothballs 2016-01-20 01:31:05 +00:00
duncathan salt
1b2ec539af Merge pull request #14708 from xxalpha/aimoduleinstall 
Installing laws to an empty AI core will now use install() instead of snowflake.
 2016-01-19 07:28:25 -06:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
xxalpha
8a669c93db Changed aimodule code to use laws datum instead of AI mob. 2016-01-18 03:08:41 +00:00
tkdrg
4e0e763cff Merge pull request #14677 from Buggy123/patch-8 
Reflectors now give back the materials used to construct it when deconstructed.
 2016-01-17 22:01:21 -03:00
tkdrg
fa8cc5cd12 Merge pull request #14669 from xxalpha/shingles 
Objects under rwindows don't break.
 2016-01-17 17:30:57 -03:00
xxalpha
6d56fafa1c fasdasdjaidfhasiufh 
conflix

fuck that

mistake

Clearer if
 2016-01-17 20:14:02 +00:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Buggy123
c3257ff8fb Corrected syntax error 2016-01-16 18:19:06 -05:00
Buggy123
01cb4cb340 Reflectors now give back the materials used to construct it when deconstructed. 2016-01-16 18:12:40 -05:00
xxalpha
e4150ac88e Merge remote-tracking branch 'upstream/master' into shingles 2016-01-16 18:37:40 +00:00
xxalpha
6ff3817a89 Repath windows (oh god), nerf normal windows ex_act. 2016-01-16 18:27:16 +00:00
xxalpha
2cc55c3ba0 Changed floor ex_act to not break grilles & src if under r-windows. 2016-01-16 17:43:33 +00:00
Menshin
828c1ddf2c * Generalized AStar check for objects preventing passability 
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616)
 2016-01-16 15:27:31 +01:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Buggy123
03da055f5c Maybe now it'll compile? 2016-01-10 01:58:44 -05:00
Buggy123
2d6ba27ce8 Update mirror.dm 2016-01-10 01:38:44 -05:00
tkdrg
7bf3834b5e Merge pull request #14487 from xxalpha/shingles 
Floor level objects will now be protected from explosions until they are exposed.
 2016-01-09 20:30:02 -03:00
xxalpha
4dd308c278 fix 
glass windows no strong

Affect all levels if in devastating range.
 2016-01-09 23:00:24 +00:00
Mike Long
33a9f7cb15 Can put mop in janicart when dry 
Fixes #5428
 2016-01-07 11:02:06 -05: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