Commit Graph

24886 Commits

Author SHA1 Message Date
Kyep
dd767648d0 Fox requests 2017-03-07 22:33:04 -08:00
Kyep
257a34e821 Re-adds crusader armor with nerfed stats 2017-02-28 23:12:09 -08:00
Kyep
3a44f7272e Nerfs Validhunting Chaplains
Changes:
- Nerfs nullrod damage from 18 to 14, spellblade/carpblade from 15 to
12. Nullrod keeps is many forms and abilities, but now you have to
choose between a weapon with holy effects, and really good damage. You
no longer get both.
- Chaplain no longer get crusader armor (roundstart riot armor!) in
their locker. Roundstart riot armor is rather silly, especially for
someone in the service department.

🆑 Kyep
tweak: Chaplains no longer get roundstart riot-grade armor. In addition,
their nullrods do less damage.
/🆑
2017-02-28 22:34:10 -08:00
KasparoVy
f425f0ae4e Plasmaman Suit only extinguishes when you're on fire.
Had to make it disregard negative firestacks because showers (and
probably some other things). This check is extremely similar to one just
a few lines above, so it makes sense.
2017-02-28 00:50:03 -05:00
Fox McCloud
1634788ba5 Merge pull request #6635 from Krausus/ClickSubstituteTweaks
[s].click Substitute Tweaks
2017-02-28 00:21:28 -05:00
Fox McCloud
45286f3a7f Merge pull request #6634 from Crazylemon64/airlock_runtime_fix
Fixes roundstart airlock runtime
2017-02-28 00:19:48 -05:00
Crazylemon64
31679e729f Fixes roundstart airlock runtime 2017-02-27 20:06:34 -08:00
Krausus
18ba27fd70 Click substitute tweaks 2017-02-27 23:04:55 -05:00
FlattestGuitar
8d4127c80d Disables the .click macro 2017-02-27 23:07:25 +01:00
uraniummeltdown
d0d2c63f30 remove trailing returns, alter checks, setdir, light_range 2017-02-27 15:03:28 +04:00
uraniummeltdown
0c7ec9d330 Merge remote-tracking branch 'remotes/upstream/master' into statues
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
2017-02-27 14:27:24 +04:00
Fox McCloud
cdf5b55ac1 Merge pull request #6535 from KasparoVy/rigfix
Fixes Rigsuit NODROP-Related Bug and Improves Rigsuit Verb Readability
2017-02-26 18:04:51 -05:00
Krausus
32df184a47 Fixes religious choices blocking round startup 2017-02-26 17:48:39 -05:00
Fox McCloud
8729dff99e Merge pull request #6588 from Crazylemon64/random_barrier
Adds a random barrier for use in mapping
2017-02-26 17:27:20 -05:00
Crazy Lemon
e6e3ebd462 Merge pull request #6599 from davipatury/datacore-effect
Refactors datacore into a datum
2017-02-26 09:38:56 -08:00
Fox McCloud
21941f4547 Merge pull request #6566 from Kyep/aiupload_zlevel_restrict
Stops AI & Borg upload consoles working on other zlevels
2017-02-26 12:35:17 -05:00
Fox McCloud
116d852d60 Merge pull request #6587 from Crazylemon64/immovable_rod_is_finite
Immovable rods no longer loop forever
2017-02-26 12:08:28 -05:00
Fox McCloud
5772b6170b Merge pull request #6618 from Crazylemon64/firedoor_robofix
Robots can now work with firelocks again
2017-02-26 11:56:36 -05:00
Crazylemon64
d43c921b68 Fixes barber and captain equipment 2017-02-26 07:32:12 -08:00
Crazylemon64
923b5b160b Should prevent false-alarm rod events 2017-02-26 07:26:07 -08:00
Crazylemon64
fb88011dcd Robots can now work with firelocks again 2017-02-26 07:19:12 -08:00
Kyep
c4e7d346bd Crazy request 2017-02-26 04:59:04 -08:00
Crazy Lemon
21eaf98684 Merge pull request #6481 from davipatury/atm-ui
ATM Nano-UI-ification
2017-02-25 22:43:36 -08:00
Crazy Lemon
3f36c99bad Merge pull request #6606 from Kyep/mentor_verb_bugfix
Fixes spam when mentors check playtime/playerage
2017-02-25 22:38:13 -08:00
Kyep
04de186145 Loadout system bugfix
🆑 Kyep
bugfix: players will no longer spawn with loadout items their job has no
access to. /🆑
2017-02-25 18:53:08 -08:00
Kyep
92e21bffcc Fixes spam when mentors check playtime/playerage 2017-02-25 18:47:02 -08:00
Crazy Lemon
186edb14e7 Merge pull request #6468 from tigercat2000/job_refactor_tg
Ported /tg/'s outfit datums, refactored job controller to support them
2017-02-25 17:54:01 -08:00
davipatury
97b9e17955 Datacore refactor. 2017-02-25 22:31:19 -03:00
Crazy Lemon
992fae8cf5 Merge pull request #6500 from davipatury/secure_data-ui
Security Records Nano-UI-ification
2017-02-25 16:59:59 -08:00
Fox McCloud
1e44336a3a Merge pull request #6555 from KasparoVy/vox-plasmaman-reagent-bsns
Reagent Oxygen is Toxic to Vox, Reagent Plasma Heals Plasmamen, Plasmaman Suit Autoextinguish & Plasmaman Exposure Burn Fixes
2017-02-25 17:11:08 -05:00
Fox McCloud
616a0ff8d1 Merge pull request #6446 from Kyep/terrorspiders-PR3
Terror Spiders 3 - Awaymission & AI
2017-02-25 17:04:30 -05:00
Fox McCloud
ec30a8b629 Merge pull request #6580 from Draconic-saint/spartan_fluff
Spartan fluff
2017-02-25 16:50:28 -05:00
Kyep
6fac5bcc98 Tiger changes 2017-02-25 06:06:51 -08:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
davipatury
26d5a016f0 The same error in two pull requests. 2017-02-25 09:56:27 -03:00
Fox McCloud
fbed82b080 Merge pull request #6570 from SamHPurp/no-ghost-spin
Refactors the Chair Rotate verb
2017-02-25 06:51:57 -05:00
Sam
83e616d8d8 Removes a superfluous return
Hopefully the final change..
2017-02-25 09:08:41 +00:00
Fox McCloud
1044b2b84d Merge pull request #6515 from Crazylemon64/fast_servermonitor
Telecomms monitor is speedier now
2017-02-24 23:25:47 -05:00
Crazy Lemon
9173611f69 Merge pull request #6503 from davipatury/skills_ui
Employment Records Nano-UI-ification
2017-02-24 18:54:28 -08:00
Crazy Lemon
e81592c3db Merge pull request #6499 from davipatury/med_data-ui
Medical Records Nano-UI-ification
2017-02-24 18:53:33 -08:00
Crazy Lemon
9bc203d32f Merge pull request #6482 from davipatury/eftpos-ui
EFTPOS Nano-UI-ification
2017-02-24 18:53:19 -08:00
Crazy Lemon
1bc176ee8c Merge pull request #6498 from Markolie/firedoorchange
Makes firelocks more lethal
2017-02-24 18:23:11 -08:00
Crazy Lemon
4c88191fb9 Merge pull request #6504 from Twinmold93/bloodpack_labeling
BloodPack Tagging/Pen Labeling
2017-02-24 18:20:46 -08:00
Crazylemon64
5b148e13e8 Adds a random barrier for use in mapping 2017-02-24 18:18:46 -08:00
Crazylemon64
2f8feff402 Refactors tcomms stuff a little 2017-02-24 18:10:08 -08:00
Crazylemon64
369bf483b5 Immovable rods no longer loop forever 2017-02-24 15:09:04 -08:00
Sam
e1abe58da7 Fixes indentation 2017-02-24 20:09:17 +00:00
Crazy Lemon
4c14385b67 Merge pull request #6534 from Kyep/bless_smite_logging
Adds logging to admin use of Smite/Bless
2017-02-24 12:06:09 -08:00
Sam
79d5d7dc0c Removes an unnecessary 'else' statement
Tidies the code up a bit more
2017-02-24 20:05:59 +00:00
Crazy Lemon
9382db1767 Merge pull request #6430 from FalseIncarnate/botany2
Botany adjustments/re-addition/fixes/whatever (RE-UPLOAD)
2017-02-24 12:03:07 -08:00