Commit Graph

782 Commits

Author SHA1 Message Date
LetterJay
92c693ecc7 Merge pull request #2924 from Citadel-Station-13/upstream-merge-30961
[MIRROR] You can now Indiana Jones one explosion.
2017-09-24 11:33:39 -04:00
LetterJay
914e661618 Merge pull request #2908 from Citadel-Station-13/Ashwalker-nerfs
Mining Shuttle requires mining access to use
2017-09-24 11:33:21 -04:00
LetterJay
ac8e74e517 Update freezer.dm 2017-09-24 08:35:36 -05:00
Iamgoofball
60bdb54024 You can now Indiana Jones one explosion. 2017-09-23 23:34:04 -05:00
Armhulen
2f64e2099f Rare Spider Variants! (#30593)
* vipers use venom, tarantulas are fat and slow.

* viper!

added!

* tarantula!

done!

* tarantulas are big guys

nobody pushin them round

* added maidwives, added spider channel

* me and cobby lose our minds over shitcode 2

electric boogaloo

* midwives have skins

shiny

* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO

* new nurse sprite is in!

yay

* cosby joke about all my shit corrupting idk

this is gonna be annoying to fix

* Revert "cosby joke about all my shit corrupting idk"

This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.

* starts to add spidervenom, finishing tomorrow

* fuck god dammit shit fuck

* WE ARE BACK IN BIZNIZ TY ORANGES

* whoops

* feed me semour feed me all night long

fixes the cyberboss stuff except that complicated one i'll do something else with it for now

* temporary fix maybe

* lets just have this for now and i'll fix this later

* all good

* fixes

* does what i should have done a long time ago

* SKINS SKINS SKINS PULLAPALOOZA

* i think this does it okay

* spiders miright

* merge conflict fix?

* MISTAKES WERE MADE

* spider commands are cool now

* he protec

but he also attac

* ty joan

* ty joan again
2017-09-23 16:18:43 -05:00
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBot
222274d108 [MIRROR] Using a soulstone on somebody now transfers your languages to the shade (#2911)
* Merge pull request #30939 from MoreRobustThanYou/patch-8

Using a soulstone on somebody now transfers your languages to the shade

* Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 05:53:56 -05:00
Poojawa
08d4b2084e Update ghost_role_spawners.dm 2017-09-23 02:32:44 -05:00
Poojawa
391c82e68d Update ghost_role_spawners.dm 2017-09-23 02:23:32 -05:00
Poojawa
28e9bc7d8c added a IC clause to make enforcement easier. 2017-09-23 02:18:02 -05:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875)
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
2017-09-22 23:35:54 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895)
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
2017-09-22 23:35:36 -05:00
CitadelStationBot
2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
2017-09-22 23:35:22 -05:00
CitadelStationBot
e9e80e3ce6 [MIRROR] Stops restraint removal progress bar spam (#2899)
* Stops restraint removal progress bar spam

* Stops restraint removal progress bar spam
2017-09-22 22:36:16 -05:00
CitadelStationBot
2757fae7e2 [MIRROR] Fixes shaving headless mobs (#2890)
* Fixes shaving headless mobs

* Update cosmetics.dm
2017-09-22 22:31:54 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866)
* Adds some new plushies

* Update packs.dm
2017-09-22 22:31:07 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643)
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
2017-09-22 22:30:44 -05:00
CitadelStationBot
3e2f638793 [MIRROR] Cleans up internal temp code (#2853)
* Cleans up internal temp code (#30715)

* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm

* Cleans up internal temp code

* Update living.dm

* Update living.dm

* fixes then ommits mob_temp stuff.

* wew lad. commenting shit out is picky af.
2017-09-22 20:20:56 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
LetterJay
50e9dd17b6 Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745
[MIRROR] Dice will now roll when thrown
2017-09-19 12:20:34 -04:00
kevinz000
7c0e17236d Fixes safes not having adjacency checks (#30859)
* Update safe.dm

* Update safe.dm
2017-09-19 10:56:51 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705)
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
2017-09-19 06:37:56 -05:00
Poojawa
b6fdbb54f5 Update dice.dm 2017-09-19 06:35:36 -05:00
CitadelStationBot
d4a577014a [MIRROR] Fixes esaw icon (#2831)
* Fixes esaw icon

* Update energy.dm
2017-09-18 01:46:20 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813)
* Stops AIs from taking actions while depowered

* Update ai.dm
2017-09-18 01:45:59 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768)
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
2017-09-17 23:07:05 -05:00
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815)
* Window spawner refactor (#30747)

* Window Spawner Refactor
2017-09-17 22:42:22 -05:00
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823)
* Fix ingredient boxes

* Fix ingredient box icon (again)
2017-09-17 22:36:21 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833)
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
2017-09-17 22:31:30 -05:00
CitadelStationBot
d0c9f79a37 [MIRROR] Makes building with plasma glass a thing. (#2820)
* Makes building with plasma glass a thing. (#30800)

* Makes building with plasma glass a thing.

* Updated grille.dm

* Makes building with plasma glass a thing.
2017-09-17 22:22:50 -05:00
CitadelStationBot
29a2309f70 [MIRROR] Fixes the issue of potted plants not having their overlays when picked up/equipped. (#2822)
* Fixes the issue of potted plants not having their overlays when picked up/equipped.

* Fixes the issue of potted plants not having their overlays when picked up/equipped.
2017-09-17 22:20:58 -05:00
CitadelStationBot
b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814)
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
2017-09-17 12:03:31 -05:00
CitadelStationBot
ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811)
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
2017-09-17 12:03:12 -05:00
CitadelStationBot
acc2104068 [MIRROR] Adds href token to station name rejection (#2798)
* Adds href token to station name rejection (#30740)

* Adds href token to station name rejection

* Update charter.dm

* Adds href token to station name rejection
2017-09-17 12:00:39 -05:00
CitadelStationBot
cbfee7e313 [MIRROR] Tank gauge rounding fix (#2800)
* Merge pull request #30749 from ShizCalev/tank-display-fix

Tank gauge rounding fix

* Tank gauge rounding fix
2017-09-17 11:58:50 -05:00
CitadelStationBot
d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808)
* PDA game log entry contains ckey

* PDA game log entry contains ckey
2017-09-17 11:58:11 -05:00
Robustin
422373e649 Dice will now roll when thrown 2017-09-16 11:37:38 -05:00
CitadelStationBot
e4af04823a [MIRROR] Fix pressure plate spam (#2775)
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
2017-09-16 04:35:45 -05:00
CitadelStationBot
ccd55bb779 [MIRROR] Remove /obj/proc/gang_contraband_value (#2799)
* Remove /obj/proc/gang_contraband_value() (#30744)

unused

* Remove /obj/proc/gang_contraband_value
2017-09-16 04:31:22 -05:00
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
2017-09-16 04:29:22 -05:00
CitadelStationBot
af0080b00b [MIRROR] Stops ranged stack splitting (#2785)
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
2017-09-15 02:51:53 -05:00
CitadelStationBot
c6b9892dc0 [MIRROR] Fixes potted plants putting you above wall objects (#2754)
* Merge pull request #30676 from ShizCalev/plant-layer-fix

Fixes potted plants putting you above wall objects

* Fixes potted plants putting you above wall objects
2017-09-14 07:39:13 -05:00
CitadelStationBot
40f5d7d4bf [MIRROR] Fixes wash_obj misuse (#2753)
* Fixes wash_obj misuse (#30658)

* Fixes wash_obj misuse

* This too

* Ree

* REEEEE

* Fixes wash_obj misuse
2017-09-14 07:38:51 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733)
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
2017-09-13 22:54:12 -05:00
CitadelStationBot
b4c27d5533 [MIRROR] Chainsaws now have a suicide! (#2734)
* Chainsaws now have a suicide! (#30559)

* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep

* Chainsaws now have a suicide!
2017-09-13 22:53:55 -05:00
CitadelStationBot
0bc0d643ab [MIRROR] Fixes rack parts progress bar (#2737)
* Fixes rack parts progress bar

* Update tables_racks.dm
2017-09-13 22:49:23 -05:00
CitadelStationBot
9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599)
* Fix monastery shuttle + Pods

* actually ports podfix
2017-09-13 17:58:25 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539)
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00