shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

919 Commits

Author SHA1 Message Date
Jordan Brown
3ba00b1e9b Merge pull request #37774 from KorPhaeron/pixel 
Adds missing pixel to HoS parade uniform
 2018-05-11 17:30:23 -05:00
ShizCalev
6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
Armhulen
04057dc7d6 Plasmamen organs GET sprites! (#37595) 
* DONE

* initial

* Removes random slashes
 2018-05-02 21:21:11 -05:00
Nabski89
b71e8718eb Animated Spellbooks (#37538) 2018-05-02 10:35:57 -05:00
deathride58
dca50e5d35 Merge pull request #6575 from Citadel-Station-13/upstream-merge-37349 
[MIRROR] Adds fly and moth categories to limb grower
 2018-05-02 01:21:37 +00:00
deathride58
4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501 
[MIRROR] Fixes missing icons
 2018-05-02 01:19:58 +00:00
deathride58
9c41fd5516 Merge pull request #6566 from Citadel-Station-13/upstream-merge-37528 
[MIRROR] Sprite reorganizing, minor sprite fix for mineral stacks
 2018-05-02 01:19:11 +00:00
Trevor Serpas
4a7ee96b76 fixes teleprod inhands (#37547) 
* adds teleprod inhands

Because stunbatons not having inhands is kinda an issue.

* Removes my shit sprites, moves original sprites to the correct file
 2018-04-30 01:16:39 -05:00
erwgd
2ca75d7de7 added fly and moth categories to limb grower and limbgrower_designs.dm (#37349) 
only human and lizard synthetic limbs will have should_draw_greyscale set to true

added /improper and uncapitalised synthetic limb names

removed plasmaman parts from human_parts_greyscale.dmi
 2018-04-29 17:52:44 -05:00
Pigeons
8dee99740d Moves all sheet prefix sprite from mining.dmi to stack_objects.dmi and fixes a typo 2018-04-29 10:06:14 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
deathride58
532ccc412c Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373 
[MIRROR] Fixes missing augmentation hands
 2018-04-27 09:42:46 +00:00
deathride58
2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 
[MIRROR] Removes SCP_294
 2018-04-27 09:35:43 +00:00
ShizCalev
9e3f99092f Fixes missing augmentation hands (#37373) 2018-04-27 02:42:13 -05:00
Armhulen
17aa0acef8 Removes SCP_294 (#37326) 
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
 2018-04-25 10:05:57 -05:00
Poojawa
1bbe495740 icons 2018-04-23 03:54:37 -05:00
AnturK
8a3caaae6b Mapping component helper (#37314) 
* Mapping component helper

* GetAllContents so you can manipulate things in crates/onmobs/whatever

* More verbose warning.
 2018-04-22 19:18:17 -05:00
LetterJay
c6d5050fe7 Merge pull request #6435 from Citadel-Station-13/upstream-merge-37196 
[MIRROR] Gives mining bots back their mesons
 2018-04-22 02:41:25 -05:00
LetterJay
b4b41d33cf Merge pull request #6428 from Citadel-Station-13/upstream-merge-37204 
[MIRROR] Add missing bio suit on-body icon
 2018-04-22 02:38:58 -05:00
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -05:00
vuonojenmustaturska
ed201bc65d Gives mining bots back their mesons (#37196) 
* Gives mining bots back their mesons

* qdel
 2018-04-16 04:36:40 -05:00
Jordan Brown
7122beb985 Merge pull request #37204 from AutomaticFrenzy/patch/bio-suit 
Add missing bio suit on-body icon
 2018-04-15 22:25:23 -05:00
deathride58
5f81921fa6 Merge branch 'master' into synctesting 2018-04-08 03:41:50 +00:00
CitadelStationBot
43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300) 
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
 2018-04-07 22:38:32 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
MrDoomBringer
b87addc531 adds a sprite to the "show roundend report" button (#36875) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* bingo bongo i dont wanna leave the congo i REFUSE to go

* wjhon approval
 2018-04-01 21:51:08 -05:00
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
fludd12
7826515aed Walls made entirely of wood! (#36524) 
* Buffs Lifebringers (And kind of botany.)

* Retools staff to use earthsblood as fuel, can now remove rock walls

* No more blessings!

* Dismantle the means of production.
 2018-04-01 12:24:33 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
LetterJay
9d229ebb8c Merge pull request #6207 from Citadel-Station-13/paperhat 
Adds Paperhat as a donator item
 2018-04-01 01:04:42 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147 
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
 2018-04-01 01:01:55 -05:00
LetterJay
d36fac0662 another donator item 2018-03-31 21:49:15 -05:00
LetterJay
48bfd57b0f Merge pull request #6161 from Citadel-Station-13/upstream-merge-36714 
[MIRROR] Fixes strobe shields' icon getting stuck
 2018-03-31 06:19:55 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
XDTM
75187908a3 Fixes strobe shields' icon getting stuck (#36714) 
* Fixes strobe shields' icon getting stuck

* src instead of get_turf(src)
 2018-03-28 13:42:48 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398) 
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
 2018-03-26 11:01:22 -05:00
Nightspark43
399c2745bd Glass of Sake icon fix (#6089) 
🆑
fix: fixes the glass of sake icon not appearing
/🆑
 2018-03-26 04:35:55 -05:00
CitadelStationBot
9892fabe4e [MIRROR] Restores empty state to 96x96.dmi (#6109) 
* Restores empty state to 96x96

* Restores empty state to 96x96.dmi
 2018-03-26 04:31:17 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099) 
* New torch sprites, fixed missing inhands

* missing sprites
 2018-03-26 04:27:30 -05:00
LetterJay
54432ac723 cloak icon update 2018-03-25 03:10:29 -05:00
kevinz000
9eb6eb6225 [READY] ~SPELL CARDS~, homing projectiles, and more! 2018-03-22 15:40:07 -05:00
LetterJay
09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
LetterJay
b3b8c5c7e6 donator stuff, cleans up file 2018-03-21 23:00:47 -05:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop 
Adds IPCs refractors preferences
 2018-03-21 19:20:43 +00:00
CitadelStationBot
4403ccf908 [MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038) 
* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)

* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
 2018-03-21 14:00:54 -05:00
LetterJay
8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
CitadelStationBot
7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018) 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
 2018-03-19 22:17:05 -05:00