b61766fbc5
Merge pull request #8812 from tigercat2000/night_shift
...
Nightshifts & Randomized Station Time
2018-04-03 18:09:09 -04:00
8fae4e380f
Merge pull request #8840 from Fox-McCloud/spacevine-fix
...
Fixes Unkillable Spacevines
2018-04-02 21:16:29 -07:00
c22025abfa
Fixes Unkillable Spacevines
2018-04-03 00:08:56 -04:00
8e5a42a7a1
Merge remote-tracking branch 'upstream/master' into night_shift
...
# Conflicts:
# code/world.dm
2018-04-02 17:24:36 -07:00
d07ef9a1ec
Merge pull request #8793 from DesolateG/Cricketborg
...
Adds Cricket Borgs to appearance selection for Cyborgs.
2018-04-01 23:46:03 -07:00
43671698cd
Merge pull request #8490 from Kyep/pet_tweaks
...
Station Pet Tweaks
2018-04-01 21:53:51 -07:00
39e0612683
deletes pushing changes
2018-04-01 21:43:24 -07:00
2c02c7bbc0
Removes pulling changes
2018-04-01 21:29:28 -07:00
d883b962df
Merge pull request #8826 from EldritchSigma/patch-1
...
Fixes Mech Disablers being not printable half the time
2018-04-01 21:21:29 -07:00
27dceb6131
Merge pull request #8613 from shazbot194/E-pistols
...
Adds in energy pistols
2018-04-01 20:42:42 -07:00
64c3bd0eb0
Merge pull request #8754 from IK3I/SubversionOfTheSubverted
...
When you're not in the mood...
2018-04-01 20:38:21 -07:00
1350dfa0c2
Updates wording
2018-04-01 22:30:50 -05:00
adcf2dcada
Merge fix
2018-04-01 19:17:48 -08:00
f05aac5715
Merge pull request #8658 from Tayyyyyyy/borg_qol
...
Borg QOD improvements
2018-04-01 19:56:39 -07:00
f6dad122ba
Merge pull request #8357 from Aurorablade/VirusNostolgia
...
Wherein Fethas proves to be evil incarnate
2018-04-01 19:22:31 -07:00
0f4c25f91c
Merge pull request #8528 from Tayyyyyyy/robot_talk
...
Make robot talk easier to read
2018-04-01 18:52:27 -07:00
aa8038c4e7
Merge pull request #8616 from Tayyyyyyy/shuttle_cheese
...
Reduce shuttle cheese
2018-04-01 18:48:31 -07:00
e67ba4ecd8
Merge pull request #8503 from Kyep/frikin_laser_beams
...
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
2018-04-01 18:47:31 -07:00
15d30b457e
Fixes Mech Disablers being not printable half the time
...
Apparently the Firedart and Mech-Disabler have the same ID for some bizarre reason. This PR fixes it. Its a minor fix and my first PR. Its basicly just changing one line to fix this pretty decent mech weapon to make it printable like it is every now and then.
Cause its weird that you can print it from round to round, but most of the time you can only print the stupid firedart.
2018-03-30 19:20:51 +02:00
e71c4279a7
Merge remote-tracking branch 'upstream/master' into night_shift
...
# Conflicts:
# paradise.dme
2018-03-30 10:20:21 -07:00
a94ffdb49f
Merge pull request #8790 from matt81093/inf_fish_fix
...
Fixes infi fish issue
2018-03-29 23:55:04 -04:00
a7bab46b3b
Removes Stat Throttle
2018-03-28 15:50:58 -04:00
067f5cf8e8
Merge pull request #8717 from GunDOSMk1/Norstead's-Fluff
...
Norstead's fluff : Soviet Casual Uniform
2018-03-28 15:41:18 -04:00
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -04:00
affc986684
Fix time shit & Add secrets verb
2018-03-26 20:16:22 -07:00
c13ce9099f
Merge pull request #8810 from Fox-McCloud/sun-subsystem
...
Ports Sun Controller to Subsystem
2018-03-26 15:21:02 -07:00
931068c261
Merge pull request #8818 from Birdtalon/bluespace-cheese
...
Stops bluespace Cheese cheese
2018-03-26 14:11:00 -07:00
941b8c2389
recursive checking for putting objects inside slicable foods
2018-03-26 20:19:11 +01:00
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
2b6a6eb812
Ports Sun Controller to Subsystem
2018-03-25 19:23:26 -04:00
589c2d17a1
= is not == FailFish
2018-03-25 01:38:27 -05:00
3b37884a71
Should fix infi fish issue
2018-03-25 01:38:27 -05:00
4b03a9abba
Second fix part 1
2018-03-24 16:41:14 -08:00
e6cc32d1b6
Merge pull request #8803 from shazbot194/More_Jackets
...
Updates Patch's Jacket icons and adds some more colors
2018-03-23 19:56:28 -07:00
a3183ee485
Upadates Patch's Jacket icons and adds some more colors
2018-03-23 17:42:59 -08:00
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
c4449fea39
Whoops
2018-03-22 15:41:33 -07:00
47f1e2c1e4
Address Fox's concerns
2018-03-22 15:39:41 -07:00
b14faa19c3
Merge remote-tracking branch 'upstream/master' into SMC
...
# Conflicts:
# code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
e635f7cbf3
Antag Toggle now appears only after antags are chosen in preferences.
2018-03-21 18:43:52 -05:00
3b1783fe66
Second merge fix part one
2018-03-20 21:16:20 -08:00
d88a17a0f4
Fix runtimes, remove world init BS, UpdateTickRate()
2018-03-20 18:32:45 -07:00
8be770ed5d
Icon is named pill, not pills
2018-03-20 18:19:45 +01:00
53bb5eaf35
Vulp Hunger Hotfix
2018-03-19 19:37:35 -04:00
50f9d695a5
Merge pull request #8124 from Aurorablade/Dreams
...
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
5a756ad3c9
Merge pull request #8708 from Birdtalon/nanocalcium
...
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
6f5a666b1a
Merge pull request #8284 from Aurorablade/CultPassBug
...
Cult pass split: Bugs and runes
2018-03-19 13:28:36 -07:00
0a9a3c2b2b
More icons for the M90 ( #8738 )
2018-03-19 13:20:31 -07:00
de46e81793
Merge pull request #8775 from Birdtalon/take
...
Re-adds "Take" shortcut into admin help
2018-03-19 11:29:09 -07:00
Fox McCloud