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
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
3891e67d8d
Merge pull request #11162 from Core0verload/rnd-implants
...
RnD update
2015-08-18 20:20:12 +01:00
1505dffec4
Merge pull request #11061 from phil235/ReacExplosionFix
...
Fixes reactionary explosion not acting correctly.
2015-08-18 20:16:23 +01:00
7453449531
Merge pull request #10975 from bustygoku/Backpacks-Slotstuff
...
Changes Backpack Slotcount to 21
2015-08-18 20:14:16 +01:00
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
8b07203a87
Buffs RCD disable Malf power
...
- Halfed cost to 25 processing power
- Can now be used multiple times
- No longer disables Cyborg RCDs
- Fixes the feedback message not showing
- Fixed mech RCDs not being affected by the power
2015-08-17 11:03:53 -05:00
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
0951213f85
Use Krausus' fix for Paradise station to replace my laggy spawn(0) fix.
2015-08-17 02:11:27 +02:00
bf13763e3b
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into del2qdel
2015-08-16 23:34:03 +02:00
dfae1e0b53
Changes a lot of del() to qdel()
2015-08-16 23:33:22 +02:00
0e78170041
fixes deconstruction and RPD
2015-08-16 14:55:33 -06:00
e2e7b3dc38
Why was it capitalized
2015-08-16 10:08:08 -07:00
d1655e335a
makes it more clear
2015-08-15 21:27:49 -07:00
e05a127fd1
Updates defib message when >180 damage
2015-08-15 21:26:10 -07:00
df758d2fff
Merge pull request #11146 from MMMiracles/biomemes
...
Revamps Bioterror Darts
2015-08-15 22:47:00 +02:00
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
8b67597538
Merge branch 'master' of https://github.com/tgstation/-tg-station into ihatethisfilesomuch
2015-08-14 21:37:27 -06:00
db2651da9f
I screwed up that merge
2015-08-14 21:36:35 -06:00
d320c4c945
first pass of cleaning up construction.dm + merge from upstream
2015-08-14 20:55:09 -06:00
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
bf7dadc538
Merge pull request #11175 from Memendia/master
...
Grammar Fix
2015-08-14 12:25:57 +02:00
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
46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
5e18380888
Merge pull request #11103 from AnturK/latespawn
...
Adds admin verb to reset latejoin spawns
2015-08-13 16:38:11 +02:00
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
2bb4f63023
Merge pull request #11087 from phil235/GirderSinguloPull
...
Girder deconstruction bugfix
2015-08-13 16:33:28 +02:00
6b649e583b
Grammar Fix
2015-08-12 21:09:39 -07:00
720ffcc862
Merge pull request #11073 from RemieRichards/WireModernisation
...
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
9104fd7456
Merge pull request #11107 from Core0verload/bedfix
...
Fixes #11090
2015-08-12 19:43:28 -04:00
a06271733e
Fixes and changes
2015-08-12 20:31:35 +03:00
eedea4d281
Merge pull request #11018 from Core0verload/hammerspace
...
New traitor item: storage implant
2015-08-12 14:45:23 +01:00
df4d5cfe0d
RnD update
2015-08-12 15:18:13 +03:00
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
9622676d1e
Merge pull request #11132 from Cheridan/too_much_fun
...
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
a959ed3727
Merge pull request #11120 from phil235/ThrowEmbedFix
...
Fixes item embedding not working.
2015-08-12 06:20:26 +01:00
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
3a5cde5988
Merge pull request #10901 from CosmicScientist/mobcostumes
...
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
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
3eb09817e4
Removes the burning object out of the burning list before qdel()ing, fixing some runtimes
2015-08-10 19:06:45 -03:00
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
ad1da7c157
Removes tape recorder wires to fix a server-crashing bug.
2015-08-10 14:00:05 +02:00
2df4cdb7cd
Thank you Remie for catching this intentional error.
...
Removes amount = 30
2015-08-09 23:07:24 -05:00
e6fe8baa24
Astral Tiles 1.01 - Fun Removal
2015-08-09 23:02:32 -05:00
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
83327ca40b
Gang tags no longer rotate based on the user's dir, this was fugly and the sprites were NOT designed to do this.
2015-08-10 02:14:15 +01:00
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
e922f510c5
Fixes not getting the hit message and sound (and logging) when the item embeds itself in a human.
...
Throwing a big item at an alien no longer pushes it.
If the item embeds itself in you, it doesn't push you.
Fixes an old argument in item/throw_impact() that I forgot to remove.
Rename the skip argument of hitby() to skipcatch (more explicit).
2015-08-09 20:30:47 +02:00
d2a4024e7f
reagent reaction() now use more methods. Instead of just INGEST or TOUCH, we now have INGEST (for injection, ingestion), TOUCH (for splashing), PATCH (for patch application and blob attack), and VAPOR (for smoke, foam and spray application).
...
- TOUCH no longer transfer reagent by default, it's now only used for touch based effect like being flammable when touched by fuel or you and your stuff being acided when touched by acid).
- PATCH does no transfer of its own (but actual patches code do make a transfer) but is used for touch effect that ignore clothes and protection (blob attacks, patches effect going through hardsuits)
- VAPOR does reagent transfer but it takes into account clothing protection
Fixes a typo in humanoid/get_permeability_prot
Fixes acid splashing on objects not destroying it. Fixes acid splashing on turf not destroying objects on the turf.
Changed damp rag smothering code a bit.
Blob Smoke now doesn't do anything.
2015-08-09 14:23:12 +02:00
73b4e8f5a6
Fixes #11110
2015-08-09 15:22:25 +03:00
Remie Richards
Memendia
GunHog
Aranclanos
phil235
Firecage
duncathan
SconesC
phil235
Swag McYolosteinen
Cheridan
WJohn
c0
MMMiracles
Cheridan