Commit Graph

2872 Commits

Author SHA1 Message Date
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
cfa77cdc18 apperance ---> appearance (#2218) 2017-08-03 06:03:25 -07:00
CitadelStationBot
6cd0855b5a Unifies datum var definitions (#2237) 2017-08-03 06:02:58 -07:00
CitadelStationBot
87b56c9d9c Testmerged [s] PRs no longer shown to non-admins (#2220) 2017-08-03 06:02:37 -07:00
CitadelStationBot
91a44d4c35 Makes cyborg remote interaction limited. (#2230) 2017-08-03 06:02:15 -07:00
CitadelStationBot
6f855fbd52 Adds another planetstation mob, the "Seedling" (#2233) 2017-08-03 06:01:28 -07:00
CitadelStationBot
36029ea7cb Fixes explosion_block being inconsistent (#2236) 2017-08-03 06:00:35 -07:00
CitadelStationBot
4843cbe67d Fixes subsystem MC crash tracking (#2239) 2017-08-03 06:00:03 -07:00
CitadelStationBot
365fe761a0 Makes bIcon scale to 16x16 like byond chat output did (#2238) 2017-08-03 05:59:38 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
CitadelStationBot
f62fc85f0d [MIRROR] Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list. (#2172)
* Admin "Reload Station" Map Generator - Reloads specified block to roundstart. also buildmode area mapgens have names instead of paths on a list.

* clean up + manual sync
2017-08-02 06:28:08 -05:00
LetterJay
c443a63b05 Merge pull request #2227 from Citadel-Station-13/upstream-merge-29620
[MIRROR] fixes astar and windoors
2017-08-02 06:06:58 -05:00
LetterJay
b8eb8ebea4 Merge pull request #2223 from Citadel-Station-13/upstream-merge-29603
[MIRROR] Fixes silicons not returning an Initialize hint
2017-08-02 06:06:46 -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
7cfcd1ec15 fixes astar and windoors 2017-08-02 05:22:18 -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
LetterJay
0392f761d0 Merge pull request #2117 from Citadel-Station-13/upstream-merge-29324
[MIRROR] DCS Continued
2017-08-01 23:55:14 -05:00
CitadelStationBot
6cb9444588 Fixes silicons not returning an Initialize hint 2017-08-01 18:10:59 -05:00
CitadelStationBot
1e82ad9d3e Fixes devil pitchforks being uninitialized 2017-08-01 17:57:44 -05:00
LetterJay
b3eaf226ac Merge pull request #2217 from Citadel-Station-13/upstream-merge-29598
[MIRROR] Removes spaces to underline from add_details
2017-08-01 17:08:14 -05:00
LetterJay
03e508475f Merge pull request #2216 from Citadel-Station-13/upstream-merge-29601
[MIRROR] Spellchecking
2017-08-01 17:07:56 -05:00
CitadelStationBot
d6fdd618e8 Removes spaces to underline from add_details 2017-08-01 08:46:27 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot
d176fcf24c Refactors pie throwing and fixes throwing not finalizing in some cases 2017-08-01 07:48:16 -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
29f8f8eb45 Update component.dm 2017-07-31 23:36:49 -05:00
LetterJay
e8ae703c16 Update turf.dm 2017-07-31 18:15:16 -05:00
LetterJay
3be62f3ccd Update _lists.dm 2017-07-31 17:33:13 -05:00
LetterJay
576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00
LetterJay
bb4a98937f Merge pull request #2071 from Citadel-Station-13/upstream-merge-29363
[MIRROR] Fix missing keyword argument syntax in typecache_filter_list
2017-07-31 17:14:38 -05:00
LetterJay
aedd22090b Update _lists.dm 2017-07-31 15:40:52 -05:00
LetterJay
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280
[MIRROR] Refactor Lung Handling
2017-07-31 15:37:41 -05:00
ktccd
a2f92461a4 Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585
[MIRROR] Improves several Sound Loops' Performance
2017-07-31 22:06:17 +02:00
ktccd
3083ad7aa0 Merge pull request #2205 from Citadel-Station-13/upstream-merge-29581
[MIRROR] Corrected holding cell access requirements
2017-07-31 22:05:09 +02:00
ktccd
9918ed7d0c Merge pull request #2204 from Citadel-Station-13/upstream-merge-29582
[MIRROR] Update labor camp stacker accepted sheets.
2017-07-31 22:04:28 +02:00
ktccd
55e2c49b5a Merge pull request #2203 from Citadel-Station-13/upstream-merge-29583
[MIRROR] Fixes a cliffhanger comment
2017-07-31 22:03:16 +02:00
ktccd
b8c8f9d3b2 Merge pull request #2202 from Citadel-Station-13/upstream-merge-29577
[MIRROR] Cyborgs grabbing ore works consistently
2017-07-31 22:02:44 +02:00
ktccd
445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
2017-07-31 21:59:10 +02:00
ktccd
a6e74b9a27 Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572
[MIRROR] Removes a rogue period from the sliver theft objective
2017-07-31 21:51:42 +02:00
ktccd
f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
2017-07-31 21:48:50 +02:00
ktccd
aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540
[MIRROR] Fixes mutation toxins not stunning properly
2017-07-31 21:46:03 +02:00
CitadelStationBot
3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
CitadelStationBot
4ac6b49871 Corrected holding cell access requirements 2017-07-31 08:58:05 -05:00
CitadelStationBot
29b26fbc3e Update labor camp stacker accepted sheets. 2017-07-31 08:57:59 -05:00
CitadelStationBot
2d74f9f45a Fixes a cliffhanger comment 2017-07-31 08:57:56 -05:00