Jordie
a433f43b05
Merge pull request #11261 from Memendia/master
...
C4 text fix
2015-08-19 18:58:31 +10:00
Remie Richards
f26874a654
Merge pull request #11230 from SconesC/defib-c
...
Adds some clarity to a defib message when confronted with extreme tissue damage
2015-08-18 20:31:50 +01:00
Remie Richards
3c46b36cc4
Merge pull request #11218 from duncathan/ihatethisfilesomuch
...
Cleaning up construction.dm; very minor change to RPD
2015-08-18 20:29:51 +01:00
Remie Richards
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
Remie Richards
7453449531
Merge pull request #10975 from bustygoku/Backpacks-Slotstuff
...
Changes Backpack Slotcount to 21
2015-08-18 20:14:16 +01:00
Memendia
9ecee2251b
Grammar Fix
...
Fixes
Shiina Kishida activates the C-4 and holds it above >>> his <<< head! It looks like she's going out with a bang!
2015-08-18 00:42:30 -07:00
duncathan
0e78170041
fixes deconstruction and RPD
2015-08-16 14:55:33 -06:00
SconesC
e2e7b3dc38
Why was it capitalized
2015-08-16 10:08:08 -07:00
SconesC
d1655e335a
makes it more clear
2015-08-15 21:27:49 -07:00
SconesC
e05a127fd1
Updates defib message when >180 damage
2015-08-15 21:26:10 -07:00
phil235
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
duncathan
8b67597538
Merge branch 'master' of https://github.com/tgstation/-tg-station into ihatethisfilesomuch
2015-08-14 21:37:27 -06:00
duncathan
db2651da9f
I screwed up that merge
2015-08-14 21:36:35 -06:00
duncathan
d320c4c945
first pass of cleaning up construction.dm + merge from upstream
2015-08-14 20:55:09 -06:00
Swag McYolosteinen
6b091e0cb6
Merge pull request #11086 from freerealestate/rcdrebalance
...
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
phil235
bf7dadc538
Merge pull request #11175 from Memendia/master
...
Grammar Fix
2015-08-14 12:25:57 +02:00
Swag McYolosteinen
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
Swag McYolosteinen
1142403f32
Merge pull request #11070 from PatchouliKnowledge/awkwardpoisons
...
Fixes syndie poison kits not being able to hold what they come with
2015-08-13 16:33:54 +02:00
Memendia
6b649e583b
Grammar Fix
2015-08-12 21:09:39 -07:00
Cheridan
720ffcc862
Merge pull request #11073 from RemieRichards/WireModernisation
...
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
c0
a06271733e
Fixes and changes
2015-08-12 20:31:35 +03:00
Remie Richards
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
c0
df4d5cfe0d
RnD update
2015-08-12 15:18:13 +03:00
Remie Richards
9622676d1e
Merge pull request #11132 from Cheridan/too_much_fun
...
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
Cheridan
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
MMMiracles
35b78b1209
Revamps bioterror darts into a non-lethal syringe form. Removed the coniine and spore toxin to make it solely for quiet take-downs (in thoery).
2015-08-11 01:56:38 -04:00
Remie Richards
fcbd841b60
Merge pull request #11138 from Miauw62/eckeck
...
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 13:03:10 +01:00
Miauw
ad1da7c157
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 14:00:05 +02:00
Cheridan
2df4cdb7cd
Thank you Remie for catching this intentional error.
...
Removes amount = 30
2015-08-09 23:07:24 -05:00
Cheridan
e6fe8baa24
Astral Tiles 1.01 - Fun Removal
2015-08-09 23:02:32 -05:00
Cheridan
4313c9c343
Merge pull request #11089 from RemieRichards/ItemDropMouseOpacity
...
Fixes items keeping mouse opacity if their container is destroyed
2015-08-09 21:47:57 -05:00
Cheridan
b7ca110654
Merge pull request #11096 from Incoming5643/chen_goes_fishing
...
Stepping on horns now invokes the proper experience
2015-08-09 18:49:35 -05:00
c0
73b4e8f5a6
Fixes #11110
2015-08-09 15:22:25 +03:00
Cheridan
63698004d6
Fixes Conflicts, Also Structural Code Stuff
2015-08-08 20:16:53 -05:00
Cheridan
d915997ea7
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/11057
...
Conflicts:
icons/obj/items.dmi
2015-08-08 19:36:36 -05:00
phil235
70a8046081
Merge pull request #10815 from bgobandit/bagtags
...
Body bag sprites now update their tag overlay properly.
2015-08-09 02:18:56 +02:00
bgobandit
1f3440649a
fixes my shit
2015-08-08 19:49:09 -04:00
CosmicScientist
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
Jim Boonie
a7b09a84ab
- Made costs and delays variables
...
- Made plasteel multiplier a variable
- Made shocked grilles shock unprotected RCD users
- Made grilles deconstruct instantly to match wirecutters
- Made RCD unable to deconstruct reinforced floors
- Changed canRwall to canRturf to cover both r walls and floors
- Changed large matter cartridge matter amount to 160 so it can still fit in the RCD
- Added fourth matter cartridge to RCD crate so it once again holds enough cartridges to fully load it
2015-08-08 21:18:45 +12:00
Incoming
ed6b59c78e
Stepping on horns now invokes the proper experience. Now the clown can honk even if you disable its hands.
...
#NotDeadJustBusy
#ThisIsOverADecadeTooLate
2015-08-08 01:05:40 -04:00
Remie Richards
9fb63dbec9
Fixes items that survive a storage container's destruction keeping the storage mouse_opacity
2015-08-07 23:02:28 +01:00
Jim Boonie
ebea552319
- Rebalances RCD construction costs around metal construction menu cost values
...
- Makes matter cartridges worth twice as much matter as metal/glass sheets
2015-08-08 06:15:35 +12:00
Jordie
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
Remie Richards
4870122858
Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
...
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
PatchouliKnowledge
d80ecd8c74
Fixes syndie poison kits not being able to hold what they come with
2015-08-07 02:44:46 +03:00
c0
f57fe6785c
A fix
2015-08-07 01:06:56 +03:00
c0
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03:00
Cheridan
eb210ab6e8
Adds Astral Carpet Tiles
2015-08-05 23:46:49 -05:00
Remie Richards
bcc55795f6
Merge pull request #10973 from MrPerson/automatic_stackomatic
...
Automatic stack merging
2015-08-06 02:33:45 +01:00
phil235
cdb8a5731b
Merge pull request #11042 from Core0verload/fixedmyshit
...
Fixes implants not showing on HUD
2015-08-05 22:42:42 +02:00
