Commit Graph

8160 Commits

Author SHA1 Message Date
Sam a316c544f4 ree 2018-04-21 15:23:27 +01:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud b659a1d9a1 Merge pull request #8678 from Kyep/ts_tunneler
Terror Spider Update, Brown Terrors
2018-04-08 01:38:34 -04:00
Fox McCloud 196d0b90f9 Makes Records GC (most of the time) 2018-04-07 23:38:10 -04:00
Kyep 4f3fa5c11c Tiger requests 2018-04-07 13:50:23 -07:00
tigercat2000 f60fbf9cef Merge pull request #8573 from uraniummeltdown/drone
Makes Drones A Small Mob
2018-04-06 21:21:50 -07:00
tigercat2000 86f89382c4 Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf
Nerfs loot-pinata-ing of hotel guards
2018-04-06 20:07:30 -07:00
tigercat2000 57a4be2138 Merge pull request #8794 from Birdtalon/fixes
Fixes and tweaks
2018-04-06 20:02:07 -07:00
Fox McCloud af7abe2679 Makes Stacks Garbage Collect 2018-04-06 19:32:08 -04:00
Fox McCloud 9901fa4154 tweaks 2018-04-05 23:36:34 -04:00
Fox McCloud f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
Fox McCloud 1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port
# Conflicts:
#	paradise.dme
2018-04-03 18:21:04 -04:00
tigercat2000 8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	code/world.dm
2018-04-02 17:24:36 -07:00
Crazy Lemon d07ef9a1ec Merge pull request #8793 from DesolateG/Cricketborg
Adds Cricket Borgs to appearance selection for Cyborgs.
2018-04-01 23:46:03 -07:00
Crazylemon64 002684fa5d Hotel space guards now fight back more meaningfully
and now dust on death to prevent loot pinata-ing
2018-04-01 22:26:32 -07:00
Crazy Lemon 43671698cd Merge pull request #8490 from Kyep/pet_tweaks
Station Pet Tweaks
2018-04-01 21:53:51 -07:00
Kyep 39e0612683 deletes pushing changes 2018-04-01 21:43:24 -07:00
Kyep 2c02c7bbc0 Removes pulling changes 2018-04-01 21:29:28 -07:00
tigercat2000 64c3bd0eb0 Merge pull request #8754 from IK3I/SubversionOfTheSubverted
When you're not in the mood...
2018-04-01 20:38:21 -07:00
IK3I 1350dfa0c2 Updates wording 2018-04-01 22:30:50 -05:00
tigercat2000 f05aac5715 Merge pull request #8658 from Tayyyyyyy/borg_qol
Borg QOD improvements
2018-04-01 19:56:39 -07:00
tigercat2000 0f4c25f91c Merge pull request #8528 from Tayyyyyyy/robot_talk
Make robot talk easier to read
2018-04-01 18:52:27 -07:00
tigercat2000 e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift
# Conflicts:
#	paradise.dme
2018-03-30 10:20:21 -07:00
Kyep 8930946f69 increases delay before queen auto-nests, to give players more chance to catch an un-nested queen 2018-03-29 20:16:29 -07:00
Kyep e59933b7b0 follows convention: ENVIRONMENT_SMASH_RWALLS from UM's PR 8674 2018-03-29 20:16:04 -07:00
Kyep d8677acc58 fixes merge conflict in prince.dm 2018-03-29 20:06:41 -07:00
Fox McCloud 7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
Fox McCloud 1f13b6a449 queue the deletes 2018-03-28 20:19:28 -04:00
Fox McCloud 22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud 5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
tigercat2000 bc4fb3d79b Nightshifts & Randomized Station Time
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
2018-03-25 23:01:04 -07:00
Birdtalon 2b24f1b278 cyborgs now correctly remove diagnostic hud 2018-03-23 18:48:36 +00:00
uraniummeltdown edb3b6aa8b makes drones mob_size = MOB_SIZE_SMALL
check for mob_size on doors Bumped() is now MOB_SIZE_TINY
2018-03-23 15:22:38 +04:00
Desolate a7b43b2153 Adds new code to allow for different open panel sprites than just the default. Adds new Cricket Borgs. 2018-03-23 00:38:54 -05:00
tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000 b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
IK3I e635f7cbf3 Antag Toggle now appears only after antags are chosen in preferences. 2018-03-21 18:43:52 -05:00
Fox McCloud 53bb5eaf35 Vulp Hunger Hotfix 2018-03-19 19:37:35 -04:00
tigercat2000 50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
tigercat2000 6f5a666b1a Merge pull request #8284 from Aurorablade/CultPassBug
Cult pass split: Bugs and runes
2018-03-19 13:28:36 -07:00
tigercat2000 cd6b8dfe45 Merge pull request #8566 from Aurorablade/BuffsVulpkanin
Tips the Scales
2018-03-19 11:27:35 -07:00
Aurorablade 2e74bcd4d5 Why this no commit? 2018-03-19 02:05:37 -04:00
Aurorablade 737a1575ff NYAH 2018-03-19 01:44:48 -04:00
Aurorablade 13212ee27c Style Tweaks 2018-03-18 23:44:38 -04:00
IK3I 404150ba8f For the sake of clarity 2018-03-13 00:45:26 -05:00
IK3I da0e7b595a Adds a preround antag roll toggle 2018-03-11 19:41:21 -05:00
Tad Hardesty 1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
Kyep 9f4ac1f354 new queen sprite 2018-03-04 16:19:11 -08:00
uraniummeltdown b09e3ae6f6 spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos 2018-03-05 02:07:31 +05:00
uraniummeltdown 8f26d5b8b6 rename __DEFINES/mob.dm to __DEFINES/mobs.dm
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00