Crazy Lemon
2da9316b4e
Merge pull request #8226 from Anasari/GarroteBehindYouNuffinPersonnel
...
Nuke Op items discount & rebalance
2018-01-04 14:51:28 -08:00
tigercat2000
c1c4b08807
Merge pull request #8476 from uraniummeltdown/decon
...
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
uraniummeltdown
1c9b3ed159
removes useless alter_health() unused proc
2018-01-02 20:49:28 +05:00
tigercat2000
9241a2ed1e
Merge pull request #8494 from SkullyRoberts/AppeaseARC
...
Remove the Red Cross from the last of the medical sprites
2018-01-01 12:24:37 -08:00
tigercat2000
591f718995
Merge pull request #7848 from KasparoVy/splat
...
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
2017-12-31 08:00:14 -08:00
tigercat2000
be9e258fd9
Merge pull request #8468 from Aurorablade/SaltInTheEyes
...
Decouples Darksight from Colorblind
2017-12-31 06:33:49 -08:00
SkullyRoberts
7338a9e571
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2017-12-29 16:14:23 -05:00
uraniummeltdown
75e177b7a9
renames receive_damage() for animations to receiving_damage()
...
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
tigercat2000
2375edf1fd
Merge pull request #8422 from Tayyyyyyy/crew_pinpointer
...
Port /tg/ crew pinpointer
2017-12-27 06:44:11 -08:00
uraniummeltdown
73d7af2675
moves var/can_deconstruct to obj level
...
moves proc/deconstruct() and proc/take_damage() to obj level, moves a few obj damage procs in with it to new obj_defense.dm
moves plastic flaps to new plasticflaps.dm
2017-12-26 18:16:42 +05:00
tigercat2000
061632a7f3
Merge pull request #8438 from Fox-McCloud/giant-spider-fix
...
Fixes Various Issues with Giant Spiders
2017-12-23 19:11:07 -08:00
SkullyRoberts
583af44187
Removed incorrect header discriptions
...
Someone's gotta comment this stuff properly.
2017-12-13 17:58:33 -05:00
Tayyyyyyy
9ae483758a
Add to medivends and remove from brig phys
2017-12-12 01:08:16 -06:00
Tayyyyyyy
5d8b45f20e
Stay in medbay, CMO
2017-12-07 10:37:44 -06:00
Tayyyyyyy
791ff1a5d3
Give crew pinpointer to blueshield
2017-12-06 23:37:01 -06:00
Fox-McCloud
bd4ecf0bd4
Fixes Various Issues with Giant Spiders
2017-12-07 00:06:10 -05:00
Crazy Lemon
c02a561a5a
Merge pull request #8283 from Kyep/no_peace
...
Removes peacekeepers
2017-12-05 15:12:56 -08:00
Aurorablade
203e998640
oh god here we go
2017-12-03 23:03:56 -05:00
Tayyyyyyy
8f0bb38284
Put crew pinpointer in brig phys, CMO, and paramedic lockers
2017-12-03 20:17:28 -06:00
tigercat2000
7902c26833
Merge pull request #8359 from uraniummeltdown/airlock
...
Airlock Code Update + Tweaks
2017-12-02 11:33:23 -08:00
tigercat2000
48d78b4648
Merge pull request #7832 from Fox-McCloud/lungsss
...
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
tigercat2000
e69f931b78
Merge pull request #8405 from uraniummeltdown/smooth
...
Diagonal Icon Smoothing
2017-11-30 11:18:02 -08:00
uraniummeltdown
3dd6fcc040
moved emagged airlock message to examine()
...
highsec airlocks built with 4 plasteel too
adds science airlocks to metal recipes and RCD
adds hatch and maint hatch to RCD
improve door assembly construction messages
2017-11-29 21:21:20 +04:00
uraniummeltdown
74755d4c60
removed req_amount from stack_recipe_list
2017-11-29 20:09:48 +04:00
Kyep
1c3b1957cb
Fixes merge conflict
2017-11-28 22:39:01 -08:00
uraniummeltdown
e3f8960df6
small icon smoothing optimization
...
icon states for false walls
2017-11-29 10:17:49 +04:00
Kyep
7b43540403
Tiger requests
2017-11-28 04:44:08 -08:00
Kyep
32bf868e0a
Fox requests
2017-11-27 17:52:48 -08:00
Kyep
5325b1eb21
RSF negative energy fix
2017-11-27 17:43:08 -08:00
tigercat2000
3a759004f6
Merge pull request #8396 from Ty-Omaha/Log
...
Adds plasma ignitions to the atmos investigate logs
2017-11-26 13:04:13 -08:00
tigercat2000
853fe2e73c
Merge pull request #8312 from Kyep/ert_borg_fix
...
Tweaks/Improves ERT borgs
2017-11-26 12:37:55 -08:00
tigercat2000
77810081e7
Merge pull request #8331 from uraniummeltdown/effectfiles
...
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
Kyep
e5db535056
Tiger requests
2017-11-26 12:28:47 -08:00
tigercat2000
0dfdc8ae2a
Merge pull request #8302 from Kyep/better_service_borgs
...
Buffs Service Borgs
2017-11-26 12:15:25 -08:00
Ty-Omaha
9cb754ba57
gets rid of an unneeded (
2017-11-25 12:17:36 -05:00
Ty-Omaha
e96ad102f9
investigate log stuff
2017-11-25 12:03:58 -05:00
Fox-McCloud
da1dcab8ea
Fixes Picking Up Items
2017-11-22 19:38:52 -05:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
Kyep
173a9f443d
increase snackfood creation cost to 4k of the 7.5k default cell
2017-11-11 15:51:08 -08:00
uraniummeltdown
de08b914bb
gave door assemblies names
...
added vault door assembly made with 4 plasteel sheets
centcom/ele airlocks have their own assembly
emagged airlock has a different desc
screwdrivering an airlock now displays a message
electronics go into assembly after do_after
2017-11-11 10:13:23 +04:00
tigercat2000
367f0f1ca2
Merge pull request #8155 from FalseIncarnate/windows
...
Windows Update
2017-11-10 22:00:19 -08:00
tigercat2000
612d81a906
Merge pull request #8291 from Anasari/AssumingGender
...
Stop assuming gender.
2017-11-10 10:15:17 -08:00
uraniummeltdown
b545359618
reordered vars, removed var/ and "as mob/obj" in proc args, removed src., removed unnecessary spacing, added ishelpers, removed unnecessary .0
2017-11-09 20:22:38 +04:00
uraniummeltdown
bca7b3602c
renames assembly_type to assemblytype for parity with tg
...
moved a few door and airlock procs around to more sensible positions
removed useless vars on some airlocks in airlock_types.dm
lowercased all airlock/door objects
2017-11-09 15:23:15 +04:00
FalseIncarnate
49c65da656
Shuttle window health reduction
2017-11-07 21:20:09 -05:00
FalseIncarnate
6a941a8526
Message and spacing tweaks
2017-11-04 18:13:39 -04:00
FalseIncarnate
66f10657bd
fix merge conflicts (again)
2017-11-04 17:37:30 -04:00
uraniummeltdown
2fd7d2e32f
finishing touches, particle effects pass tables and grilles
2017-11-04 23:36:36 +04:00
uraniummeltdown
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
uraniummeltdown
5c4f4ec5e5
effect/system to effect_system
...
effect/effect to effect/particle_effect
make foam an effect again
move explosion_particles.dm to effect_system folder
OOP effect code, addtimers, QDEL_IN
fixed reagent explosions never having a flash range due to a typo
2017-11-04 18:21:51 +04:00
