CitadelStationBot
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
coiax
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
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
Tad Hardesty
5560a557e7
Refactor ladders so that they actually work ( #32797 )
2017-11-20 02:05:52 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Jordan Brown
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
Firecage
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
Jordan Brown
3d50fec086
Merge pull request #31714 from DaxDupont/screaminginternally
...
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
XDTM
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
XDTM
5b0b2fd5bb
Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-05 10:53:47 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
CitadelStationBot
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
CitadelStationBot
9b08d9d5c9
[MIRROR] Fixes the magic ladder ( #2843 )
...
* Fixes the magic ladder
* Update necropolis_chests.dm
2017-09-17 22:16:04 -05:00
LetterJay
4312b93ad2
Merge pull request #2702 from Citadel-Station-13/upstream-merge-30548
...
[MIRROR] Magic Ladder
2017-09-17 08:55:41 -05:00
CitadelStationBot
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
LetterJay
d4647b9e1e
Update necropolis_chests.dm
2017-09-12 23:32:24 -05:00
KorPhaeron
bdf08037ff
Magic Ladder
2017-09-11 12:39:16 -05:00
kingofkosmos
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
Ashe Higgs
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
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
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
kevinz000
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
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
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
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
LetterJay
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
CitadelStationBot
2342c8f2bc
Fixes scythes cutting kudzu ( #2185 )
2017-07-29 19:50:24 -07:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
CitadelStationBot
41101906c4
Adds logging for the blood contract
2017-07-21 18:28:11 -05:00
CitadelStationBot
94f7ec2380
The blood-drunk miner will fire its KA a bit more often
2017-07-20 22:25:48 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
63ffbdf090
Fixes cleave conditions for the cleaving saw ( #2006 )
2017-07-14 19:30:06 -07:00
CitadelStationBot
92c6b7b445
Adds a 'nemesis faction' system to transforming weapons
2017-07-13 17:46:51 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
CitadelStationBot
a101497539
Warp cubes are slightly less instant but way cooler
2017-07-06 20:12:38 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
LetterJay
54549d43a2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728
2017-06-05 23:07:52 -05:00
CitadelStationBot
cb755fc6d0
Adds three unique kinetic accelerator modules to necropolis chests
2017-06-01 15:32:16 -05:00
CitadelStationBot
c07034f45a
The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
2017-05-27 20:55:08 -05:00
