shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,477 Commits 5 Branches 0 Tags
05bbc437822604de36ae4fa45119366258eb5584
Commit Graph

765 Commits

Author SHA1 Message Date
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
CitadelStationBot
abe52f40a6 [MIRROR] Fix transit tube atmos (again) (#2736) 
* Fix transit tube atmos (again) (#30597)

* Fix transit tube atmos

* transit tube Initialize()

* Fix transit tube atmos (again)
 2017-09-13 16:55:00 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJay
f55ad5ec95 Update safe.dm 2017-09-12 23:12:19 -05:00
LetterJay
82db333ee3 Update tools.dm 2017-09-12 03:36:41 -05:00
LetterJay
3ff2263a33 Update taperecorder.dm 2017-09-12 03:22:47 -05:00
LetterJay
5c228f63a5 Update dna_injector.dm 2017-09-12 03:09:19 -05:00
LetterJay
86a1901b5d Update AI_modules.dm 2017-09-12 03:08:53 -05:00
LetterJay
460820b245 Update safe.dm 2017-09-12 03:05:46 -05:00
LetterJay
59319b6bea Update taperecorder.dm 2017-09-12 03:04:56 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531 
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
 2017-09-12 02:35:17 -05:00
LetterJay
caca1d1794 Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553 
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
 2017-09-12 01:22:11 -05:00