Commit Graph

136 Commits

Author SHA1 Message Date
LetterJay c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
2017-08-12 06:35:45 -05:00
ktccd 9ef1825ee0 Adds Taur cocks (#2329)
* Added flared taur penises

FIRST STEP ONLY DO NOT PULL REQUEST THIS!!!!
The files are still messy and the penis is just another shape to choose
from right now for testing purposes!
Flipped the order of GENITALS_BEHIND_LAYER and BODY_BEHIND_LAYER, as
taurs need to be drawn on top of the genitalia, and I don't think
anything else uses this that would need genitals drawn on top of them.

* Adds More shapes

Adds Tapered and Knotted shapes to the Taur cocks.

* Fixes on-ground sprites

The OLD bug barbed knotted cocks being invisible when not inside a body
is fixed.
This fix solves why taur cocks were invisible when cut off or gibbed the
body.
This also removes the lowershape() workaround that was being used.
I'll get around a bigger refactor of other genitalia in another PR, as
the scope of this was just to add taur cocks to begin with...
2017-08-11 12:29:01 -07:00
ktccd 62a7d4301f Refactored flavortext.
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00
LetterJay b25c5d5acc Merge pull request #2283 from Citadel-Station-13/upstream-merge-29732
[MIRROR] Freon now simply uses a color matrix rather than blending an icon
2017-08-07 07:22:47 -05:00
LetterJay ee772f52d6 Merge pull request #2273 from Citadel-Station-13/upstream-merge-29697
[MIRROR] Rewrites incorrect documentation for the pickweight() proc
2017-08-07 07:20:26 -05:00
CitadelStationBot 5242663885 Freon now simply uses a color matrix rather than blending an icon 2017-08-06 12:42:08 -05:00
CitadelStationBot e95ddfaf94 Rewrites incorrect documentation for the pickweight() proc 2017-08-06 03:09:47 -05:00
CitadelStationBot 0eea5ad53d Improves Tesla Performance 2017-08-06 03:07:38 -05: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 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 7cfcd1ec15 fixes astar and windoors 2017-08-02 05:22:18 -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 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -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
CitadelStationBot adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
LetterJay 0b27e4c11b Update _lists.dm 2017-07-19 13:39:49 -05:00
CitadelStationBot f61e22958f split typecache filters into two procs 2017-07-19 05:12:17 -05:00
CitadelStationBot 4d79c387a8 Fix missing keyword argument syntax in typecache_filter_list 2017-07-19 04:09:00 -05:00
CitadelStationBot 0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot 556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
CitadelStationBot 7a0c43e492 Makes GetAllContents faster. (#2036) 2017-07-17 00:53:50 -07:00
CitadelStationBot 9990c0008a Fixes astar pathing thru space when requested not to. (#2011) 2017-07-14 19:28:13 -07:00
CitadelStationBot f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot e43af7f1bd [MIRROR] get_edge_target_turf() now finds the proper turf when using diagonal directions (#1972)
* get_edge_target_turf() now finds the proper turf when using diagonal directions

* Update camera.dm
2017-07-10 16:15:02 -07: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
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay 5ac8e01f3b should fix file extension issue with logs 2017-06-29 22:27:51 -05:00
CitadelStationBot a7c18e65bc [MIRROR] fix .html files being invalid types (#1413)
* fix .html files being invalid types

* Delete files.dm.rej
2017-06-28 01:43:48 -05:00
LetterJay 83fead2492 Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
[MIRROR] Refactors PDA cartridge permissions
2017-06-27 06:14:42 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot 15362206dd Fixes the server taking for fucking ever to initialize for local test 2017-06-24 22:22:44 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot 1dc24668a1 Refactors PDA cartridge permissions 2017-06-19 13:57:18 -05:00
CitadelStationBot c53efc8dc7 Fixes a to_chat runtime, adds macro for sending images (#1591) 2017-06-17 13:26:42 -07:00
LetterJay cc7c07ccf3 Update unsorted.dm 2017-06-13 02:49:38 -05:00
CitadelStationBot 7589ff9285 LAZYSET() Macro 2017-06-10 17:02:12 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
LetterJay 905bd168aa commit 2017-06-06 07:13:04 -05:00
LetterJay 60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
LetterJay f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -07:00
CitadelStationBot e5f2a09622 Pixel projectile ricochets and reflections! (#1220) 2017-05-27 13:27:52 -07:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00