Commit Graph

496 Commits

Author SHA1 Message Date
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
4851b9bd82 Merge pull request #6559 from Citadel-Station-13/upstream-merge-37501
[MIRROR] Fixes missing icons
2018-05-02 01:19:58 +00: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
ShizCalev
79863a5ffb Adds new window spawners 2018-04-18 13:51:53 -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
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
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
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
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
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
LetterJay
6ee530b30a die 2018-03-18 20:16:50 -05:00
LetterJay
380ec76618 sabre and sheath 2018-03-18 12:18:08 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio
Fixes bluespace radio potions
2018-03-17 07:53:37 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05:00
CitadelStationBot
55ea11af46 [MIRROR] New RCD Sprites, ammo counters, and actual yellow flashing lights! (#5911)
* New RCD Sprites, ammo counters, and actual yellow flashing lights! (#36283)

* New RCD Sprites and spaghetti code!

* Adds new shrunken sprites!

Now with better fitting scale!

* New RCD Sprites, ammo counters, and actual yellow flashing lights!
2018-03-12 07:03:04 -05:00
LetterJay
1f3c9fca30 adds two donator items 2018-03-11 07:22:46 -05:00
CitadelStationBot
e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
Jordan Brown
7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis
Makes the smoke machine deconstructable
2018-03-09 12:48:31 -06:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
Poojawa
786ddc4694 icons 2018-03-06 21:46:57 -06:00
Poojawa
54e33374d2 Hypospray MK IIs (#5722)
* Initial commit

* most of the work down

itfinallycompiled

* tweaks

* ree

* fixes bad attempt at mode switching

* slight sprite tweak to give vials better clickability.

* can I has real review now pls thx Bhijn

* pre-emptively avoiding a troll 'review'

* WEH

* trying to code new functions is dumb

* reeeeee

put_in_hand doesn't exist apparently

and the shitty thing wants me to select mobs, not modes?

* ya lemmie just, rewrite everything

* fixes adaptation issues and sprites. Loading/unloading works

Now just to figure out reagent transfer_to code. aaaaaaaaaAAAAAAAAAAAAAAAAAAAAAAA

* HAHAHA YES

* Fully working with sounds and all.

* remove a testy boi
2018-03-06 03:56:19 -06:00