Razharas
9b710d7fcb
Merge pull request #12153 from duncathan/destroyfixes
...
Destroy() fixes
2015-10-06 09:27:41 +03:00
Razharas
87c9960d6c
Merge pull request #12102 from bgobandit/singlotips
...
FIXES SINGULARITY BEACON AND POWERSINK TEXT, IT WORKS, I DON'T CARE, FUCK
2015-10-05 22:16:00 +03:00
duncathan
4475824890
fixes #12143
2015-10-04 07:33:32 -06:00
Razharas
653e5d18f3
Merge pull request #12027 from Fox-McCloud/advancedmop
...
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Razharas
d46f6b582f
Merge pull request #12079 from bgobandit/boxshit
...
Adds additional items to the storage of many coats and oversuits.
2015-10-03 18:13:03 +03:00
Razharas
56cc5122bf
Merge pull request #12092 from Xhuis/radical_changes
...
Radiation pulse optimization
2015-10-03 18:08:48 +03:00
Cheridan
207f6a6048
Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
...
Fixes #11268 , iconless wired glass tiles
2015-10-03 09:24:07 -05:00
Jordie
c6627b3d70
Fixes iconless wired glass tiles
2015-10-02 21:28:19 +10:00
bgobandit
8e82cf324a
Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
...
Conflicts:
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
bgobandit
6c303a37cd
THIS FUCKING SHIT RIGHT HERE FUCK
2015-10-01 23:12:40 -04:00
Razharas
54d9e6924d
Merge pull request #11868 from bgobandit/diditallforthelewdbe
...
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
phil235
4694616e6b
Merge pull request #11922 from AnturK/corgiriders
...
Moves buckling from obj to atom/movable
2015-09-30 23:26:57 +02:00
Razharas
3bf8ae1f1a
Merge pull request #12057 from Xhuis/it_worked_in_testing_3
...
Fixes and tweaks to Syndicate medical cyborgs
2015-09-30 23:14:58 +03:00
Razharas
e08ecefd18
Merge pull request #12066 from feemjmeem/12013-fix
...
tank suicide now drops items in hand, shreds clothing
2015-09-30 23:12:26 +03:00
Razharas
1aa0e911ae
Merge pull request #11760 from Core0verload/selfrepair
...
Cyborgs update
2015-09-30 22:50:08 +03:00
Razharas
0108dad7db
Merge pull request #11575 from Firecage/nospaceformining
...
Xeno corrosive acid no longer spaces asteroid walls and floors.
2015-09-30 22:49:10 +03:00
Xhuis
8f5a3a2688
they literally do the same thing
2015-09-30 13:25:31 -04:00
Xhuis
e1f815c5c6
Optimizes radiation pulse calculation
2015-09-30 13:19:05 -04:00
bgobandit
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04:00
Cheridan
7367ea771c
Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen
...
Dials back the boxes [poll]
2015-09-28 23:58:19 -05:00
Cheridan
8d12c310a4
Merge pull request #11994 from bustygoku/Param-Pointers
...
Laser Pointers Use Pixel Params
2015-09-28 15:35:09 -05:00
Marc R. Uchniat
2f6f8b7362
tank suicide now drops items in hand, shreds clothes to reduce chance of removing items from round
2015-09-28 12:23:40 -07:00
Xhuis
7a8c52b84f
Merge remote-tracking branch 'remotes/upstream/master' into syndiborg_fix
2015-09-28 07:15:49 -04:00
Aranclanos
bc2febc021
Merge pull request #12029 from phil235/DeadDna
...
Fixes not being able to save the dna of corpses in the dna console.
2015-09-28 06:36:05 -03:00
Xhuis
129b7b9b2f
Fixes & tweaks
2015-09-27 23:27:18 -04:00
Razharas
50dd1f6b67
Merge pull request #12031 from Xhuis/a_pretty_rad_pr
...
Radiation changes
2015-09-28 03:24:43 +03:00
Incoming
7a4be0e04f
Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-27 18:48:57 -04:00
Incoming
52123f879f
There are no more random boxes
...
Maps now have two guaranteed spawns, one in maint and one in the cargo warehouse. You can still build more boxes yourself.
The ! easter egg can now only ever proc once per box. Once it's triggered that's the end of it.
2015-09-27 18:39:44 -04:00
Aranclanos
a135f12e3f
Merge pull request #11990 from optimumtact/patch-1
...
Comment war continues
2015-09-27 17:31:48 -03:00
Fox-McCloud
32cd0d49bb
soap for the janitor
2015-09-27 07:07:27 -04:00
Fox-McCloud
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04:00
AnturK
c23eb50454
Fixes trying to buckle to mob with another already buckled.
2015-09-26 22:06:53 +02:00
Xhuis
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
phil235
9293cdddb8
Fixes not being able to save the dna of corpses in the dna console.
...
Corpses can now have their dna changed (but they don't acquire mutations). You can use a dna injector on them and modify their dna with the dna console.
2015-09-26 18:04:35 +02:00
Fox-McCloud
6ca0a1ad40
Re-Adds Advanced Mop
2015-09-26 06:42:57 -04:00
bustygoku
c3d978e6d1
Fixes Pixel And Y Check
2015-09-25 19:48:17 -07:00
bustygoku
fc0a110df8
Viewers() Change
2015-09-25 19:26:50 -07:00
bustygoku
191a7ea195
Further Check Changes
2015-09-25 18:59:25 -07:00
bustygoku
b67cbd770b
Oops
2015-09-25 18:44:41 -07:00
bustygoku
c75a62dc7c
Added Check
2015-09-25 18:44:04 -07:00
c0
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
Razharas
d17f621389
Merge pull request #11972 from KorPhaeron/fix
...
Kitchen Spike Hotfix
2015-09-25 22:05:28 +03:00
KorPhaeron
76928b467b
Fixes var names
2015-09-25 12:25:51 -05:00
KorPhaeron
58c5404947
Fix
2015-09-25 12:22:29 -05:00
Razharas
14d54d3ef2
Merge branch 'duncathan-hemanifolds'
2015-09-25 16:45:57 +03:00
Razharas
9d8cf0ffe9
Merge branch 'hemanifolds' of https://github.com/duncathan/-tg-station into duncathan-hemanifolds
2015-09-25 16:35:08 +03:00
c0
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
Razharas
b9b8734b74
Merge pull request #11966 from MMMiracles/dwarfsman
...
Dwarfism
2015-09-25 12:18:52 +03:00
Cheridan
e1b16b057c
Merge pull request #11964 from Delimusca/durrymunchin
...
ease-of-use smoking improvements
2015-09-24 22:26:22 -05:00
Razharas
7c757a735f
Merge pull request #11968 from xxalpha/hot_or_not
...
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00