Commit Graph

4226 Commits

Author SHA1 Message Date
Kyep
623da07147 cleanup, syndipod 2018-01-05 03:46:55 -08:00
Kyep
20e2fc2db1 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-01-05 03:25:18 -08:00
Kyep
8affa05a35 progress
fixed: syndibot not exploding when killed
fixed: comms computer unusable by borgs
fixed: self destruct was taking too long
fixed: impossible to destroy fusion reactor
fixed: borgs could not use comms console
fixed: overload was not anchored
fixed: overload not dangerous to be near
fixed: syndibot was getting stuck on space tiles
fixed: syndibot was getting pushed by atmos
fixed: bathroom mirrors were not anchored
fixed: bug in code/game/turfs/simulated/floor/mineral.dm which was
applying abductor random tile appearance to all floor/mineral subtypes
instead of just the abductor subtype
fixed: syndibot navbeacons could be seen and interacted with
add: fusion core now supports wrenches/screwdrivers
add: fusion core is now destructible - destroying the reactor makes it
overload
add: random pillbox of drugs can now drop in medbay
add: random bar of a mineral can now drop in eastern office
add: random borg upgrade/cell can now drop in room south of armory
add: syndie shoes are now a possible loot item
add: minerals (one bar, random mineral) are now a possible loot item
remove: level 2 alert no longer locks doors
remove: removed syndi jammer - zlevel 6 doesn't even have telecomms -
its pointless
2018-01-05 03:20:48 -08:00
Crazy Lemon
2da9316b4e Merge pull request #8226 from Anasari/GarroteBehindYouNuffinPersonnel
Nuke Op items discount & rebalance
2018-01-04 14:51:28 -08:00
Kyep
3c8d8c0c00 more 2018-01-02 19:53:57 -08:00
Kyep
ad4e753cc4 more 2018-01-02 12:47:48 -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
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
be9e258fd9 Merge pull request #8468 from Aurorablade/SaltInTheEyes
Decouples Darksight from Colorblind
2017-12-31 06:33:49 -08: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
SkullyRoberts
583af44187 Removed incorrect header discriptions
Someone's gotta comment this stuff properly.
2017-12-13 17:58:33 -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
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
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
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
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
FalseIncarnate
66f10657bd fix merge conflicts (again) 2017-11-04 17:37:30 -04:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
uraniummeltdown
4d0ea7b630 add fade out effect to all smoke (untested), move nanofrost smoke to effects_smoke.dm, make smoke effects OOP (unfinished) 2017-11-03 16:48:33 +04:00
Ansari
da924006a6 guess i spaced out during this one 2017-11-02 11:20:37 +08:00
Ansari
c22534dd28 \the 2017-10-30 07:51:29 +08:00
tigercat2000
7ca26db3f3 Merge pull request #8285 from Aurorablade/CultPasBalance
Cult Pass split: Balance shit
2017-10-29 11:17:39 -07:00
FalseIncarnate
c1e1dc22d8 merge conflict fix 2017-10-28 18:38:20 -04:00
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
Kyep
a53960989a Tweaks/Improves ERT borgs 2017-10-26 02:45:35 -07:00
Kyep
339bd23af9 Refactor, tofu-turkey=>donut, adds alcohol
Refactors to delete copypaste and avoid magic numbers.
Replaces tofu-turkey snack with a donut.
Adds several new reagents, including ice (enables iced tea & coffee,
which have the same stats as normal versions), cream (enables doctor's
delight, a -1 tox/sec fruit drink), cola & soda (enables brown star, a
fruit drink, as well as plain old cola/sodawater), and basic alcohol
reagents tequila/vodka/whiskey (which enable tequilla sunrise,
margarita, bloody mary, screwdriver, 'syndicate bomb', whiskey cola,
whiskey soda).
2017-10-25 18:34:23 -07:00
Crazy Lemon
b31110c0e8 Merge pull request #8270 from Kyep/ert_slots
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
217b932606 Merge pull request #8220 from Anasari/BoomChickaWowWoW
Add chem reagent logging for grenade priming.
2017-10-25 14:31:09 -07:00
Kyep
0d65cf4d4c Adds Tofu Turkey & Burker, Chicken Soup & Newdles to RSF. 2017-10-24 16:11:37 -07:00
Crazy Lemon
fcd3ea3194 Merge pull request #8241 from Allfd/fastest-linda
Fastest linda
2017-10-22 10:18:52 -07:00
Ansari
dfd1c17768 Change flash pronoun to theirs 2017-10-22 17:05:59 +08:00
Ansari
a523d44c54 Stop assuming gender. 2017-10-22 15:03:55 +08:00