shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

758 Commits

Author SHA1 Message Date
deathride58
3c017a55ec Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891 
[MIRROR] Fixes airlocks playing closing sound while already closed
 2018-01-26 15:50:57 +00:00
Jordan Brown
fc5cf12523 Merge pull request #34891 from YPOQ/closesoundfix 
Fixes airlocks playing closing sound while already closed
 2018-01-26 03:00:00 -06:00
uraniummeltdown
cb8e239bd7 fixes not being able to weld mineral plating off of a mineral airlock turned into mineral airlock assembly 2018-01-26 02:58:43 -06:00
Leo
90bcf0ef84 Merge pull request #34860 from YPOQ/camerafix 
Fixes double camera assemblies when deconstructing cameras
 2018-01-25 05:11:07 -06:00
imsxz
e9cdf72439 less than 100 2018-01-24 21:23:37 -06:00
LetterJay
b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -06:00
LetterJay
793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
oranges
8b2da0aa90 Merge pull request #34746 from DaxDupont/autolathe 
Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 14:14:37 -06:00
coiax
481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476 
[MIRROR] Simple rotation component.
 2018-01-23 08:24:19 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476) 
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
 2018-01-23 02:09:16 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime 
Fixes APC controller runtime
 2018-01-23 01:42:43 -06:00
ShizCalev
a0098744c8 Reinvigorates the disco inferno 2018-01-21 01:29:42 -06:00
Jordan Brown
d57f616131 Merge pull request #34631 from uraniummeltdown/airlock 
Emagged Airlocks Are Easier To Deconstruct
 2018-01-20 09:50:00 -06:00
deathride58
f6dbe3ea58 Merge pull request #4963 from Citadel-Station-13/upstream-merge-34504 
[MIRROR] allows servants to cancel warps more intuitively by clicking on the button again
 2018-01-19 19:45:23 +00:00
deathride58
8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639 
[MIRROR] Fixes autolathe power consumption
 2018-01-19 19:35:12 +00:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504) 
* lets you cancel cc warps

* runtimestation
 2018-01-19 09:57:57 -06:00
Jordan Brown
363effb98f Merge pull request #34639 from DaxDupont/succ-less-power 
Fixes autolathe power consumption
 2018-01-19 08:52:49 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Jordan Brown
08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
LetterJay
6bcf918111 Update message.dm 2018-01-17 09:40:34 -06:00
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
BordListian
1a7341f2c4 Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401) 
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
 2018-01-16 08:36:27 -06:00
coiax
497e6bb13f Various deadchat messages are more informative and consistent (#34326) 
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
 2018-01-15 02:56:10 -06:00
F-OS
af1d40ca52 Tweaks spaceheater description (#34416) 
* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Allah my loving lord and savior grant me mercy
 2018-01-14 22:03:57 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Leo
9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller 
Fix airlock console HTML
 2018-01-12 12:57:52 -06:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310 
[MIRROR] Removes some hrefs from logging
 2018-01-12 17:48:13 +00:00
deathride58
63354404e4 Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260 
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
 2018-01-12 17:46:00 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310) 
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
 2018-01-12 07:04:39 -06:00
Dax Dupont
af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) 
* Dance machine fix

* I have no ass and i must blast
 2018-01-11 21:36:56 -06:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645 
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
 2018-01-08 04:15:47 +00:00
Ashe Higgs
c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645) 
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
 2018-01-07 20:18:28 -06:00
kevinz000
ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157) 
* Fixes dchat broadcast

* Update communications.dm
 2018-01-07 18:51:16 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Cruix
015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
Dax Dupont
bf3468f61c Adds more observation messages in deadchat (#34075) 
* Adds more observation messages

* so bold kobold

* caching
 2018-01-04 15:16:58 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJay
6d1095a3cb Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917 
[MIRROR] Always use the area name when selecting a teleport beacon
 2018-01-03 04:56:55 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
4dcc65a6bc Merge branch 'master' into upstream-merge-33917 2018-01-02 17:14:53 -06:00