shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,557 Commits 5 Branches 0 Tags
4b32cf2e0f2fa48632564b7f2ef050a05ac86189
Commit Graph

212 Commits

Author SHA1 Message Date
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
CitadelStationBot
4c4bd22578 [MIRROR] Some more tweaks to Geis (#2487) 
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
 2017-08-27 01:36:17 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -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
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05: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
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -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
afbe4be50c Moves most of world.dm 2017-08-16 17:51:33 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
4edf9880d6 Update logging.dm 2017-08-14 08:23:46 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -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
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
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -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
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
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
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
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
LetterJay
dc9c53ae0a Update combat.dm 2017-07-31 06:13:00 -05:00
LetterJay
ac9c24dfe5 Update combat.dm 2017-07-31 05:53:58 -05:00
LetterJay
62d7f47497 Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455 
[MIRROR] Adds 3D Sound System
 2017-07-31 03:43: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
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
LetterJay
896fbdeed7 Update sound.dm 2017-07-30 14:10:59 -05:00
LetterJay
70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
CitadelStationBot
adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot
3db9c9ddb7 Adds 3D Sound System 2017-07-28 09:02:21 -05:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot
64f7a14e07 Adds investigate logs to portals 2017-07-20 22:26:01 -05:00
LetterJay
7b15a20022 Merge pull request #2038 from Citadel-Station-13/upstream-merge-29178 
[MIRROR] Ports /vg/'s datum component system
 2017-07-19 13:41:00 -05:00
LetterJay
96179eded8 Update combat.dm 2017-07-19 13:32:38 -05:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot
0ce34e08b6 Augment Styles/Changes 2017-07-18 06:45:44 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
6f7e908c89 RPDs can now place disposals pipes on dense non-wall turfs (#2035) 2017-07-17 00:54:17 -07:00
CitadelStationBot
37ac7ee292 Ports /vg/'s datum component system 2017-07-16 19:10:44 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
LetterJay
8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
LetterJay
905db6ded5 Update DNA.dm 2017-07-15 10:05:00 -05:00