3b3b45c03c
Fixes/tweaks wormholes event and portals ( #30846 )
...
* fix
* THERE WE GO
* Update portals.dm
2017-10-03 04:37:35 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
cc8f494f1f
Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
...
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
676abb946c
Update halloween.dm
2017-10-01 15:26:56 -05:00
f1f99fc26c
Update electrical_storm.dm
2017-10-01 15:26:32 -05:00
00aa312610
Update carp_migration.dm
2017-10-01 15:26:15 -05:00
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
77c2c77f0e
Removes a call to datum/New()
2017-09-29 15:59:19 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
8a2ec7d39a
Update radiation_storm.dm
2017-09-14 13:32:48 -05:00
c6025a7049
[MIRROR] Adds some TRUE and FALSE ( #2751 )
...
* This is not a refactor (#30670 )
* Adds some TRUE and FALSE
2017-09-14 07:38:27 -05:00
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
97b25bc59a
Update vent_clog.dm
2017-09-11 15:58:12 -05:00
fe3d825596
Update spider_infestation.dm
2017-09-11 15:57:45 -05:00
12f17ecbe7
Update radiation_storm.dm
2017-09-11 15:57:15 -05:00
57343fa712
Update immovable_rod.dm
2017-09-11 15:56:25 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
a4c92a8155
Update radiation_storm.dm
2017-09-04 03:12:51 -05:00
f344c5edf2
Merge branch 'master' into upstream-merge-30084
2017-08-29 10:09:13 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
342fd1d7fa
Alternative To Removing Kudzu Manufacturing ( #30080 )
2017-08-23 15:46:54 -05:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
2342c8f2bc
Fixes scythes cutting kudzu ( #2185 )
2017-07-29 19:50:24 -07:00
fd3ec99487
Xeno-pepe is now more rare ( #2106 )
...
Increased minimum player requirement for xenomorph event, as lowpop
xenos suck hardballs.
Also added minimum timer to the event, up from 20 to 40 min.
Weight kept the same, half default.
With this, xenomorphs should hopefully be more rare, although there's
STILL other sources to enable them those ones ALL require a human to be
dumb/malicious and release them.
2017-07-24 04:07:30 -07:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
9d3c4d4702
Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
...
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
kevinz000