290c1e0868
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916
2017-12-26 08:24:20 -06:00
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
a82d0e13ce
Fixes RND
2017-12-22 00:58:46 -08:00
74232f6373
Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550
...
[MIRROR] Adds instanceless component dupe mode
2017-12-21 04:58:20 -06:00
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
09c802f984
Merge pull request #33550 from ninjanomnom/instanceless-component-dupe
...
Adds instanceless component dupe mode
2017-12-21 00:51:02 -06:00
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
17dda62a93
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
...
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-21 03:28:14 +00:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
25d5e5b6b4
Merge pull request #33594 from AnturK/knockoff
...
Adds knock off component
2017-12-20 00:14:36 -06:00
d960c45e77
Merge pull request #33622 from duncathan/assert_gas
...
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
a98178251d
Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531
...
[MIRROR] [READY]Cyborg jousting with spears!
2017-12-19 17:31:26 -06:00
d39b0204fa
Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307
...
[MIRROR] Adds config inclusion system
2017-12-19 19:49:32 +00:00
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
8149f52777
Adds jousting ( #33531 )
2017-12-18 20:54:21 -06:00
6b4099805f
[Ready] Adds abductor Mind Interface Devices, and a gland HUD ( #33209 )
...
* Adds abductor Mind Interface Devices, and a gland HUD
* .
2017-12-18 20:29:37 -06:00
76e6cb4e48
Update server_tools.dm
2017-12-18 17:31:07 -06:00
9ccdb75e57
Update stat.dm
2017-12-18 17:23:52 -06:00
390c24b3fd
Create server_tools.config.dm
2017-12-18 16:42:17 -06:00
a85f5eea6b
Update server_tools.dm
2017-12-18 15:23:55 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
99a173b187
Update stat.dm
2017-12-17 15:54:52 -06:00
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
2f8d49de91
[READY] Monkey mode overhaul
2017-12-15 18:35:52 -06:00
b1efb191bc
fixes brain_damage_lines.json compile errors
2017-12-15 16:35:07 -08:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fdb9de488e
Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
...
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
d45b668a39
Adds config inclusion system
2017-12-14 17:24:13 -06:00
d517c797ab
adds a parent level subsystem initialized var ( #33456 )
2017-12-13 21:11:51 -06:00
55247e9bdf
Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-13 21:04:00 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
d6573f602d
Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148
...
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 23:50:20 +00:00
57ab98d8bc
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
...
[MIRROR] Airlock Construction Update
2017-12-10 23:49:51 +00:00
216b0931d1
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
...
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
d6b0683846
Airlock Construction Update
2017-12-10 15:23:34 -06:00
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
9d59e36289
Add caltrop component for spikey floor objects ( #33280 )
...
* Add caltrop component for spikey floor objects
The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.
This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.
Also, it taught me how components work.
* Code review I
* Caltrop damage is 4
* Cactus hurts
* Whoops
* Ignore restraints = true
2017-12-10 10:32:03 -06:00
7a90baa1f8
Merge pull request #33390 from duncathan/atmos-defines
...
cleans up atmos defines
2017-12-09 15:53:34 -06:00
75eab09dff
Revert "[MIRROR] [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets."
2017-12-08 19:16:49 -08:00
811517ecb2
[ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. ( #33098 )
...
* Timer queuing tweaks: binary sorted inserts and rolling buckets.
Client time timers now uses a binary search algorithm for its sorted inserts.
Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.
Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)
* Fixes some queue management bugs.
* Fixes a Order of Operations goof up in the ticks<->ds macros.
@ninjanomnom your pain is my success
* Remove debug line
* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID
* Fixes initialization-time timers fucking everything up
2017-12-08 15:02:18 -06:00
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
LetterJay