Razharas
8fd2f74d2b
Merge pull request #12223 from phil235/BugFixBoogalooB
...
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
Razharas
9dec40d8d5
Removed colon
...
Removed colon
2015-10-10 02:31:19 +03:00
Razharas
880a9f0544
Merge branch 'cargonevergetsanything' of https://github.com/bgobandit/-tg-station into bgobandit-cargonevergetsanything
2015-10-10 02:28:24 +03:00
Razharas
effae76516
Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff
2015-10-10 02:04:43 +03:00
phil235
832e650ffc
Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
...
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
phil235
0efb30434a
Fixes not being able to move during jaunting if you are cuffed and pulled.
...
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
Razharas
92523c03f2
Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
...
Sleeping Carp changes
2015-10-07 22:25:11 +03:00
Swag McYolosteinen
38f5c0c85a
Merge pull request #12122 from Steelpoint/Magazine
...
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
Razharas
7242d12cb0
Merge pull request #12159 from Aranclanos/tanksuicide
...
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-06 21:52:49 +03:00
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
Aranclanos
4d03f22943
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-04 20:16:39 -03:00
duncathan
4475824890
fixes #12143
2015-10-04 07:33:32 -06:00
Xhuis
1211ec4102
Some gang stuff
2015-10-04 00:26:26 -04: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
Cheridan
207f6a6048
Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
...
Fixes #11268 , iconless wired glass tiles
2015-10-03 09:24:07 -05:00
Steelpoint
b5ded1c9e8
InitalCommit
2015-10-03 21:22:29 +08: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
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
bgobandit
26b8112dea
Adds additional items to the storage of many coats and oversuits.
2015-09-29 22:29:07 -04: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
Fox-McCloud
960f0b3129
adds in bluespace trashbag
2015-09-26 18:07:16 -04: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
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
bustygoku
c94fd9b082
Laser Pointers Use Pixel Params
2015-09-24 16:04:14 -07:00
Razharas
3c4994749b
Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction
2015-09-24 23:52:38 +03:00
