shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,344 Commits 5 Branches 0 Tags
29a2309f70dd18e00a7ecc3319768ad199624f84
Commit Graph

233 Commits

Author SHA1 Message Date
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
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
43cad07181 Transit tube pods no longer constantly suck in air (#2478) 2017-08-24 18:30:12 -07:00
CitadelStationBot
a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
LetterJay
19b8a5a380 Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858 
[MIRROR] Fixed sign description
 2017-08-18 13:41:07 -05:00
LetterJay
db3622ca12 Update signs.dm 2017-08-18 11:18:33 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
c2d335b7da [s] Fixes MG turret firing while the user is stunned/cuffed/unconscious 2017-08-16 17:50:28 -05:00
LetterJay
1bb5e19596 Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695 
[MIRROR] flora.dm initialize hint
 2017-08-14 18:36:58 -05:00
LetterJay
f088e812a9 Update flora.dm 2017-08-14 09:31:49 -05:00
CitadelStationBot
7004797c8c Fixed sign description 2017-08-13 01:28:08 -05:00