shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,574 Commits 5 Branches 0 Tags
169aa85d9cc5c2384331ebb173350f4e24b9bba1
Commit Graph

250 Commits

Author SHA1 Message Date
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
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
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
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
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
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
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05: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
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
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
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
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
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
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
460820b245 Update safe.dm 2017-09-12 03:05:46 -05:00
LetterJay
0431fa3cb6 Merge branch 'master' into upstream-merge-30544 2017-09-11 23:21:00 -05:00
LetterJay
ce518ee45e Update closets.dm 2017-09-11 18:56:10 -05:00
LetterJay
16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
LetterJay
6cc0ea6af0 Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412 
[MIRROR] Regularizes resisting out of containers
 2017-09-11 18:05:52 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
vuonojenmustaturska
053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
AnturK
5e3e525036 Fixes lockers alt-click 2017-09-10 16:07:31 -05:00
KorPhaeron
55f9874a08 Ladders cant be moved by the singularity (#30518) 
It'd be weird to have the top part of a ladder moved five tiles and then still lead to the ladder underneath its old location. Just destroys it instead.
 2017-09-10 06:06:17 -05:00
LetterJay
780faec591 Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202 
[MIRROR] You can now drag things up and down ladders
 2017-09-09 00:59:58 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
kingofkosmos
cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -05:00
KorPhaeron
b9bbd348df You can now drag things up and down ladders (#30202) 
* Can drag things up and down ladders

* Somehow left out this line

* Icon update, auto_connect

* Uses the proper pulling proc
 2017-09-07 12:48:43 -05:00
KorPhaeron
b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
LetterJay
2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve 
Bad mirror resolve
 2017-09-06 08:59:20 -05:00
Poojawa
3ba2f650dd Adds Paradise Sofas (#2623) 
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
 2017-09-06 07:54:23 -05:00
LetterJay
af409af9cf additional files 2017-09-05 16:29:25 -05:00
CitadelStationBot
5c98b9a13b [MIRROR] Gives the detective a mass spectrometer (#2590) 
* Gives the detective a mass spectrometer

* Actually adds it
 2017-09-04 04:39:07 -05:00
CitadelStationBot
50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
kevinz000
2cce781728 Merge pull request #2430 2017-08-29 22:27:24 -07:00
kevinz000
5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00
kevinz000
df24243113 pentawew 2017-08-29 10:04:39 -07:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00