0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -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
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -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
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
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
5560a557e7
Refactor ladders so that they actually work ( #32797 )
2017-11-20 02:05:52 -06:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
3d50fec086
Merge pull request #31714 from DaxDupont/screaminginternally
...
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
5b0b2fd5bb
Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-05 10:53:47 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
9b08d9d5c9
[MIRROR] Fixes the magic ladder ( #2843 )
...
* Fixes the magic ladder
* Update necropolis_chests.dm
2017-09-17 22:16:04 -05:00
4312b93ad2
Merge pull request #2702 from Citadel-Station-13/upstream-merge-30548
...
[MIRROR] Magic Ladder
2017-09-17 08:55:41 -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
d4647b9e1e
Update necropolis_chests.dm
2017-09-12 23:32:24 -05:00
bdf08037ff
Magic Ladder
2017-09-11 12:39:16 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
938c10ad1c
Adds a unique suicide to the hierophant club, plus some attack verbs ( #30400 )
...
* Adds a suicide to the hierophant club
* Above
* good point
* Removes the delay
2017-09-07 10:01:55 -05:00
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07: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
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05: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
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
41101906c4
Adds logging for the blood contract
2017-07-21 18:28:11 -05:00
94f7ec2380
The blood-drunk miner will fire its KA a bit more often
2017-07-20 22:25:48 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
63ffbdf090
Fixes cleave conditions for the cleaving saw ( #2006 )
2017-07-14 19:30:06 -07:00
92c6b7b445
Adds a 'nemesis faction' system to transforming weapons
2017-07-13 17:46:51 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Tad Hardesty