Commit Graph

1208 Commits

Author SHA1 Message Date
LetterJay 43c774b72e Merge pull request #2319 from Citadel-Station-13/upstream-merge-29781
[MIRROR] Fixes swarmer shells having no ghost notifications
2017-08-09 11:25:02 -05:00
CitadelStationBot 83c546f143 Fixes swarmer shells having no ghost notifications 2017-08-09 03:26:14 -05:00
CitadelStationBot 943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -05:00
LetterJay 26ca12fb04 Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773
[MIRROR] Fix RCL loading
2017-08-09 02:22:09 -05:00
LetterJay 7b371b02e3 Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756
[MIRROR] Oocky in icky descriptions
2017-08-09 02:21:38 -05:00
LetterJay f68287e31e Merge pull request #2305 from Citadel-Station-13/upstream-merge-29766
[MIRROR] Belligerent now has a visible indicator
2017-08-09 02:20:51 -05:00
LetterJay 94386375a8 Merge pull request #2304 from Citadel-Station-13/upstream-merge-29767
[MIRROR] Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-09 02:20:42 -05:00
CitadelStationBot 5eadc197cf Fix RCL loading 2017-08-08 14:59:10 -05:00
CitadelStationBot fcd1a2dc86 Oocky in icky descriptions 2017-08-08 09:05:58 -05:00
CitadelStationBot fb86e03544 Belligerent now has a visible indicator 2017-08-08 09:05:54 -05:00
CitadelStationBot 68bbda4b4d Mechs can no longer open cult doors if the person inside is not a cultist 2017-08-08 09:05:50 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
LetterJay 41f42aabca Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724
[MIRROR] More Initialize() garbage
2017-08-07 07:26:53 -05:00
LetterJay 8386d5e610 Merge pull request #2290 from Citadel-Station-13/upstream-merge-29735
[MIRROR] Fixes being able to "stomp out" sigils with telekinesis
2017-08-07 07:26:30 -05:00
LetterJay fc450fd561 Merge pull request #2291 from Citadel-Station-13/upstream-merge-29725
[MIRROR] Sounds played with sound_to_playing_players are less tinny
2017-08-07 07:26:18 -05:00
LetterJay ecb68a4ccc Merge pull request #2287 from Citadel-Station-13/upstream-merge-29734
[MIRROR] Fixes certain things clearing weather overlays
2017-08-07 07:24:05 -05:00
LetterJay b449843a1e Merge pull request #2270 from Citadel-Station-13/upstream-merge-29711
[MIRROR] Fixes oversight with APCs using areastring
2017-08-07 07:18:35 -05:00
LetterJay 0dcd93ad73 Merge pull request #2268 from Citadel-Station-13/upstream-merge-29706
[MIRROR] Fixes showers breaking lighting objects.
2017-08-07 07:18:17 -05:00
LetterJay c5c25639ee Merge pull request #2267 from Citadel-Station-13/upstream-merge-29654
[MIRROR] Fixes vendors not returning an Initialize hint
2017-08-07 07:17:39 -05:00
LetterJay 6c122ea563 Merge pull request #2269 from Citadel-Station-13/upstream-merge-29691
[MIRROR] Replaces blob's send intercept sleep() with addtimer
2017-08-07 07:17:24 -05:00
CitadelStationBot 1b2efdcc1d More Initialize() garbage 2017-08-06 18:02:51 -05:00
CitadelStationBot d071a78888 Sounds played with sound_to_playing_players are less tinny 2017-08-06 18:02:47 -05:00
CitadelStationBot e80f1dba99 Fixes being able to "stomp out" sigils with telekinesis 2017-08-06 18:02:43 -05:00
CitadelStationBot 5d80d2df4b Fixes certain things clearing weather overlays 2017-08-06 18:02:33 -05:00
CitadelStationBot a90448b262 Fixes oversight with APCs using areastring 2017-08-05 19:28:33 -05:00
CitadelStationBot 90a7ead961 [MIRROR] The AI's internal camera functions better (#2219)
* The AI's internal camera functions better

* sync robot.dm and hopefully not break shit
2017-08-05 10:24:58 -07:00
CitadelStationBot 5d0f206936 Replaces blob's send intercept sleep() with addtimer 2017-08-05 12:20:41 -05:00
CitadelStationBot 7f7aed0112 Fixes showers breaking lighting objects. 2017-08-05 12:20:37 -05:00
CitadelStationBot 99ca34a7b4 Fixes vendors not returning an Initialize hint 2017-08-05 12:20:34 -05:00
CitadelStationBot 8ca4b9d614 Clockcult Combat Rebalance + Conversion Rework (#2020)
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures

* Update tips.txt

* no one cares

* manual clockcult syn
2017-08-04 11:46:22 -07:00
CitadelStationBot f5bc18bb55 buildmode fix + blueprints fix (#2261)
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.

* sync turf.dm
2017-08-04 11:46:11 -07:00
CitadelStationBot 70826963dd Tweaked SM overlay (#2243) 2017-08-04 08:43:02 -07:00
CitadelStationBot 04231f44b1 Improves Porta-Turret Performance (#2248) 2017-08-04 08:42:21 -07:00
CitadelStationBot ef715b7837 Removes all checks for subsystem existence (#2252) 2017-08-04 08:41:52 -07:00
CitadelStationBot 9449004c36 Gives an initialize hint to stacks, boxes, closets and bots (#2256) 2017-08-04 08:41:04 -07:00
CitadelStationBot 23ed5ba2a2 Fixes noncultists being able to out literally everyone from bloodcult with a single item (#2212) 2017-08-03 06:18:23 -07:00
CitadelStationBot d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
2017-08-03 06:12:27 -07:00
CitadelStationBot 1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214)
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
LetterJay 5734a2c7ed Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610
[MIRROR] Fixes devil pitchforks being uninitialized
2017-08-02 06:06:33 -05:00
CitadelStationBot b0cf9356b7 Combine the two changeturf procs into one 2017-08-02 05:20:12 -05:00
CitadelStationBot 8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot 76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot 1e82ad9d3e Fixes devil pitchforks being uninitialized 2017-08-01 17:57:44 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
kevinz000 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.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
2017-07-31 23:41:22 -07:00
ktccd 608737376b Borer admin refactor (#2209)
* Refactors and clarifications

Refactors borers to use objective datums instead of relying entirely on
hardcoded snowflake bullshit.
Also adds some FEEDBACK to the punishments, so the host isn't completely
confused why they suddenly keep getting stunlocked and blinded.
Also refactors syndi-borers to display their objectives along the other
borers instead of as an antag, since they TECHNICALLY count as a borer
for their escape objective, enabling them to cooperate.
Refactors borers weakness-chemical to be a variable instead of
hardcoded, allowing admin var-editing to work.
Borers now inherit the objectives of their parent-borer. Normally makes
no difference, but if admins were to give custom objectives to one
borer, then all its children will injerit it.

* Removed a line

Removed a piece of text that was redundant at best and incorrect at
worst. Syndicate borers makes it show up as the default 10 needed when
no other borers existed and normal borers already state their own
objective individually.
2017-07-31 21:45:32 -07:00
ktccd 4c7f288341 Adds a HUD for borers (#2211)
Borers with minds are added to the HUD and can see the HUD.
Humans with a borer are added to the HUD, but CANNOT see the HUD.
If the borer leaves, the human is removed from the HUD.
2017-07-31 21:45:00 -07:00
LetterJay e8ae703c16 Update turf.dm 2017-07-31 18:15:16 -05:00
LetterJay 576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00