Razharas
bfbe4e997e
Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE
...
Makes all Destroy() procs return properly
2015-09-01 15:54:18 +03:00
Razharas
30ac2634f4
Merge pull request #11250 from GunHog/Malf_RCD-defense
...
Buffs RCD Disable Malfunction ability
2015-09-01 11:50:17 +03:00
duncathan
48b67e5a25
Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE
...
Conflicts:
code/game/objects/effects/landmarks.dm
2015-09-01 00:11:33 -06:00
xxalpha
3f29a9866c
Merge remote-tracking branch 'upstream/master' into qdelFixes
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
duncathan
51c09f16bf
makes all Destroy()'s return properly
2015-08-31 00:21:01 -06:00
Razharas
d1c417e996
Merge pull request #11416 from xxalpha/airlockQDEL
...
Added qdel(wires) to a bunch of objects Destroy proc.
2015-08-31 00:08:27 +03:00
Cheridan
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
c0
97b792bbc3
Changed some circuits paths to reduce copypasta
2015-08-30 16:58:13 +03:00
xxalpha
3379cb8145
Fixed cyborg modules, cyborg parts and cyborgs not qdelling properly.
2015-08-29 19:24:36 +01:00
Cheridan
7f0f74f100
Merge pull request #11380 from bgobandit/salicyclicassblastusa
...
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
xxalpha
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
Aranclanos
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
bgobandit
6ab2443255
Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog.
2015-08-25 13:46:05 -04:00
bgobandit
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
c0
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03: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
GunHog
60c9106f05
Merge remote-tracking branch 'remotes/upstream/master' into Malf_RCD-defense
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-08-19 09:56:16 -05:00
GunHog
489be2d3e1
RCDs now EXPLODE!
...
- Made RCDs explode instead of simply disabled!
- Minor explosion power.
- Adds a five second warning to get rid of the RCD before it blows.
- Added a small cooldown.
2015-08-19 09:47:20 -05:00
Swag McYolosteinen
825b5794c7
Merge pull request #11239 from Firecage/del2qdel
...
del() to qdel()
2015-08-19 11:50:24 +02:00
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
GunHog
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
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
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
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
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
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
c0
73b4e8f5a6
Fixes #11110
2015-08-09 15:22:25 +03: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
