Xhuis
df9e581df0
Shadowling update 4
2015-08-27 19:29:33 -04:00
Cheridan
ba1a268305
Merge pull request #11338 from phil235/BodyBagTagSpriteFix
...
Fixes bodybag not visually opening or closing.
2015-08-24 15:07:41 -05:00
phil235
c275c9c948
Merge pull request #11300 from Supermichael777/Supermichael777-Barsigns
...
Updates the barsigns!
2015-08-24 13:58:42 +02:00
phil235
7b2262e729
Fixes bodybag not visually opening or closing.
2015-08-23 18:14:40 +02:00
Aranclanos
dd6e735e71
The remove_from_storage() call from handle_atom_del() will stop dropping the objects on null, to avoid having other storage objects with items inside in a null location.
2015-08-21 07:14:56 -03:00
Aranclanos
6f4c89c5ff
Fixes the nuclear disk from not spawning under really specific circumstances
2015-08-21 05:22:20 -03:00
Supermichael777
e0c6c710c2
Update barsigns.dm
2015-08-20 20:08:23 -04:00
Supermichael777
6fe5f23e55
Updates dank memes.
...
updates Bar memes to reflect recent rule changes/be funny.
2015-08-20 15:06:42 -04:00
Swag McYolosteinen
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
Jordie
bdd6a75382
Merge pull request #11119 from phil235/VaporizeMethodReaction
...
reagents reaction() now has more application method
2015-08-19 19:23:17 +10:00
Jordie
a433f43b05
Merge pull request #11261 from Memendia/master
...
C4 text fix
2015-08-19 18:58:31 +10:00
Remie Richards
f2cf448d4e
Merge pull request #11245 from Aranclanos/alienfacehuggerhud
...
Fixes the alien hud icon for infected people not appearing.
2015-08-18 20:39:33 +01: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
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +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
1505dffec4
Merge pull request #11061 from phil235/ReacExplosionFix
...
Fixes reactionary explosion not acting correctly.
2015-08-18 20:16:23 +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
Aranclanos
0dbc04d6a7
Fixes the alien hud icon for infected people not appearing.
...
If a mob is infected by a changeling egg, aliens won't get the hud icon.
2015-08-16 21:34:53 -03:00
phil235
0951213f85
Use Krausus' fix for Paradise station to replace my laggy spawn(0) fix.
2015-08-17 02:11:27 +02:00
Firecage
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
Firecage
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02: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
phil235
64f028c065
Merge branch 'master' of https://github.com/tgstation/-tg-station into VaporizeMethodReaction
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
2015-08-15 16:36:21 +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
phil235
1cee0d3014
Fixes slipping on water while riding janicart.
...
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores
galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.
Removes hacky unbuckling/buckling in bed/Move()
2015-08-13 23:49:02 +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
5e18380888
Merge pull request #11103 from AnturK/latespawn
...
Adds admin verb to reset latejoin spawns
2015-08-13 16:38:11 +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
Swag McYolosteinen
2bb4f63023
Merge pull request #11087 from phil235/GirderSinguloPull
...
Girder deconstruction bugfix
2015-08-13 16:33:28 +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
WJohn
9104fd7456
Merge pull request #11107 from Core0verload/bedfix
...
Fixes #11090
2015-08-12 19:43:28 -04: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
Cheridan
04b8aa46e0
Merge pull request #11128 from RemieRichards/FixGangRotation
...
Gang tags no longer rotate based on the user's dir
2015-08-12 00:23:05 -05: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
Remie Richards
a959ed3727
Merge pull request #11120 from phil235/ThrowEmbedFix
...
Fixes item embedding not working.
2015-08-12 06:20:26 +01:00
Cheridan
1c5fa3be4a
Merge pull request #11143 from Aranclanos/chemruntime
...
Removes the burning object out of the burning list before qdel()ing, …
2015-08-11 20:58:46 -05:00
Cheridan
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
