Commit Graph

220 Commits

Author SHA1 Message Date
vuonojenmustaturska 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
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
deathride58 71c3a8266a Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424
[MIRROR] Standardization of return_ordered_turfs
2017-12-11 00:06:54 +00:00
Emmett Gaines 35e8cc3e22 minor improvements (#33424) 2017-12-10 17:44:31 -06:00
uraniummeltdown d6b0683846 Airlock Construction Update 2017-12-10 15:23:34 -06: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
vuonojenmustaturska 9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
ShizCalev 5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -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
LetterJay 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay 9725456c65 Update machine_unloading.dm 2017-11-09 03:23:25 -06:00
Jordan Brown 178b41547d Little change. More the same 2017-11-06 08:46:39 -06:00
Emmett Gaines b36adfd640 No more map edge shuttle beacons (#32380) 2017-11-04 10:20:19 -05: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
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
vuonojenmustaturska 360d883879 expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)
* Initial commit

* Time is a circus

* Send in the clowns

* i broke something

* Revert "i broke something"

This reverts commit 5a29c40d131b39effe9ebcb6c8c1883693baf07f.

* I think it works?

* cleanup

* define reminders

* Fixes tendrils and such

* sentience_act now moves the mob to AI_OFF state
2017-10-19 04:57:49 -05:00
AnturK 2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
LetterJay 568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
kevinz000 ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -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
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
kevinz000 46c9ddb81c Adds tick check to ore boxes (#31396)
* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm
2017-10-12 12:39:18 -05:00
Tad Hardesty 01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
XDTM 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay f046f4f15b Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
Jordan Brown 58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
LetterJay 5ce923a4d7 Update laborstacker.dm 2017-10-07 22:51:35 -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
LetterJay cf37555c4d Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302
[MIRROR] Move shuttleRotate into the shuttle module
2017-10-05 09:13:41 -04:00
Leo ced865f76d Merge pull request #31290 from YPOQ/jaunterfix
Fixes jaunters chasm-saving feature
2017-10-05 06:48:42 -05:00
oranges cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
KorPhaeron 4e648765db Ports dash weapons to the dash datum 2017-10-03 18:11:42 -05:00
KorPhaeron 3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
bawhoppen 82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
kingofkosmos f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
ShizCalev 9b2f07335a Makes the mining vendor give more verbose feedback 2017-09-27 15:45:19 -05:00
Poojawa 7b5734d684 faction memes don't work, restrict access instead. 2017-09-23 02:11:55 -05:00
Poojawa ba9b5a0481 probably stops Ashligger station attacks 2017-09-23 00:58:32 -05:00
CitadelStationBot eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895)
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
2017-09-22 23:35:36 -05:00
Poojawa 573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -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