Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05:00
Squirgenheimer
b50ec79f49
fixes runtime in sentience.dm
2018-10-09 00:07:51 -04:00
Purpose
4d7dd5a6c9
dayum dats defined
2018-10-08 22:48:00 +01:00
Purpose
ea74920535
no no no no cyberiaaaaad
2018-10-05 20:57:41 +01:00
Desolate
c974e29a3c
global lists global defined
2018-10-02 15:52:46 -05:00
Kyep
fd2cb10975
Blob fixes, including fixes #9365
2018-09-04 19:44:14 -07:00
Crazy Lemon
61a39a71b0
Merge pull request #9255 from variableundefined/EconomyRefactor
...
Economy Refactor & Changes - Part 1
2018-09-04 17:14:25 -07:00
Crazy Lemon
b52da17809
Merge pull request #9260 from Kyep/blob_mouse
...
MouseBlobs
2018-09-04 09:26:23 -07:00
Kyep
6c4def96f4
root cause: || binds too tightly
2018-08-08 11:29:39 -07:00
Kyep
2dd35bc894
Fixes
2018-08-08 10:39:25 -07:00
Kyep
102ff67095
fixes merge conflict
2018-08-01 04:13:22 -07:00
Kyep
9f60bb8385
initial version
2018-07-26 12:12:08 -07:00
variableundefined
3b38d937b0
Economy refactors
2018-07-26 19:35:27 +08:00
Fox McCloud
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
Crazy Lemon
8c27afad9a
Merge pull request #9060 from Aurorablade/SpaceKoi
...
Space Koi Event
2018-07-13 23:04:52 -07:00
Aurorablade
9422d3a846
Suggested changes
2018-07-04 00:12:54 -04:00
Aurorablade
edbac20f4a
maybe dis?
2018-07-02 17:03:02 -04:00
datlo
79643cb587
Make ion laws more specie inclusive
...
Replaced instances of "Human" in ion laws by "Crew" to be more
compatible with the default Crewsimov and Corporate lawsets.
2018-07-01 12:16:26 +02:00
Kyep
7c70f7d92e
fixes grid check causing blue
2018-06-23 19:27:21 -07:00
Fox McCloud
5fb13096a2
Merge remote-tracking branch 'upstream/master' into weather-subsystem
...
# Conflicts:
# code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
tigercat2000
9978e22487
Merge pull request #8893 from Ty-Omaha/CDC
...
Adds more viruses to the Viral Outbreak event
2018-06-10 17:50:14 -07:00
tigercat2000
5ace5944d9
Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings
2018-05-31 19:34:47 -07:00
Aurorablade
5ae7eb3963
feedback update
2018-05-24 18:58:29 -04:00
Aurorablade
4e7aa78dca
I can be stupid.
2018-05-23 01:38:32 -04:00
Aurorablade
dd997a0b20
some tweaks.
2018-05-23 01:34:58 -04:00
Aurorablade
c1d66ab81a
KOI
2018-05-23 00:17:20 -04:00
Fox McCloud
6cdfe70303
Converts and Updates Weather Subsystem
2018-05-21 00:01:18 -04:00
Crazy Lemon
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud
f521f2765c
Removes All Modes
2018-05-11 17:55:45 -04:00
Tayyyyyyy
6f63e8b4b9
Fix Aurora Caelus spelling and grammar. Fixes #8945
2018-05-09 19:03:49 -05:00
Fox McCloud
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
tigercat2000
8c1e61f63f
Adds the aurora caelus event, the space equivelent of the northern lights.
2018-04-22 21:10:45 -07:00
Ty-Omaha
84f5848ae0
Spanish Inquisition
...
Replaces GBS with the spanish flu
2018-04-17 19:29:11 -04:00
Ty-Omaha
a541a99d42
Plague Inc
...
removes rhumba and replaces with lycan
2018-04-17 19:01:12 -04:00
Ty-Omaha
41abcb3321
Viral Outbreak
2018-04-17 18:49:43 -04: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
1d80bf01c0
Merge remote-tracking branch 'upstream/master' into gc-ss-port
...
# Conflicts:
# paradise.dme
2018-04-03 18:21:04 -04:00
Fox McCloud
b61766fbc5
Merge pull request #8812 from tigercat2000/night_shift
...
Nightshifts & Randomized Station Time
2018-04-03 18:09:09 -04:00
Fox McCloud
c22025abfa
Fixes Unkillable Spacevines
2018-04-03 00:08:56 -04:00
Kyep
d8677acc58
fixes merge conflict in prince.dm
2018-03-29 20:06:41 -07:00
Fox McCloud
22dc6860b3
Ports TG's Garbage Subsystem
2018-03-28 20:02:39 -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
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
946ae0d58d
moves var/list/armor to /obj level
...
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
Kyep
c08188ce4e
more spiderling updates
2018-02-16 01:26:33 -08:00
Kyep
5c84b0a833
green event -> spawn 5
2018-02-16 01:18:28 -08: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
tigercat2000
a5e4ccdc18
Merge pull request #8103 from FalseIncarnate/reagents
...
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
