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

1634 Commits

Author SHA1 Message Date
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
d25894447e Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048 
[MIRROR] Fixed duplicate definition
 2017-09-28 12:32:57 -04:00
LetterJay
355b9af67e Merge pull request #2960 from Citadel-Station-13/upstream-merge-30957 
[MIRROR] Revheads are now stealthier/harder to metagame
 2017-09-28 12:21:53 -04:00
AutomaticFrenzy
91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
CitadelStationBot
2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967) 
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
 2017-09-28 05:59:57 -07:00
LetterJay
64ff719843 Merge pull request #2956 from Citadel-Station-13/upstream-merge-30942 
[MIRROR] Adds installing cells as part of mech construction and fixes some mech construction bugs.
 2017-09-27 23:45:50 -04:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
LetterJay
f3da8a48a0 Update critter.dm 2017-09-27 19:11:11 -05:00
LetterJay
1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
LetterJay
31a9164362 Update combat.dm 2017-09-27 16:27:21 -05:00
LetterJay
18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
Robustin
f71c3d6614 Revheads are now stealthier/harder to metagame (#30957) 
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
 2017-09-27 15:28:35 -05:00
AnturK
ebdea5382b Here it is. 2017-09-27 13:22:16 -05:00
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -05:00
vuonojenmustaturska
10bf80139c Fixes MMI to AI law transfer (#31017) 
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
 2017-09-26 16:52:17 -05:00
LetterJay
dab03b249d Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992 
[MIRROR] Spiderpalooza 1: Foods!
 2017-09-26 15:01:02 -04:00
LetterJay
8b37c32a17 Merge pull request #2942 from Citadel-Station-13/upstream-merge-30967 
[MIRROR] Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at
 2017-09-26 14:59:20 -04:00
LetterJay
47a8ce6ae8 Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863 
[MIRROR] Bluespace pipes
 2017-09-26 14:58:23 -04:00
Armhulen
a7d0b50808 Spiderpalooza 1: Foods! 2017-09-26 11:32:36 -05:00
vuonojenmustaturska
1aef27a0f0 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967) 
* Jump boots fix

* requested changes

* Requested changes, also whoops
 2017-09-26 04:29:18 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay
8ff51624e1 Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913 
[MIRROR] Stops AIs from giving the borg a free secondary light
 2017-09-25 13:29:02 -04:00
Jordan Brown
0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
LetterJay
8fd6d9d883 Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980 
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
 2017-09-25 13:28:05 -04:00
LetterJay
45751464e0 Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975 
[MIRROR] Href tokens
 2017-09-25 13:27:27 -04:00
LetterJay
d8736482fd Update transfer_valve.dm 2017-09-25 11:55:09 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
KorPhaeron
31f6898a87 Stops AIs from giving the borg a free secondary light (#30913) 
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
 2017-09-24 17:58:37 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
pubby
382d549c2f Allow AIs to greentext survive (#30959) 
* Change AI objectives from survive to exist

* Cyberboss simplification
 2017-09-24 17:38:00 -05:00
oranges
6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
LetterJay
e16d89d077 Merge pull request #2923 from jughu/hi-hello 
Allows custom renaming for holy weapons
 2017-09-24 15:49:19 -04:00
MoreRobustThanYou
df607bb24c Implant Chairs now also support organs (#30982) 
* Implant Chairs now also support organs

* Update implantchair.dm

* Update implantchair.dm
 2017-09-24 11:55:22 -05:00
LetterJay
1c9061058f Merge pull request #2928 from Citadel-Station-13/upstream-merge-30899 
[MIRROR] Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
 2017-09-24 11:34:01 -04: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
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
Joan Lung
3505e14b45 Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period (#30899) 
* Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period

* tweak

* fix
 2017-09-24 10:10:22 -05:00
LetterJay
f462c1ba93 Merge pull request #2925 from Citadel-Station-13/upstream-merge-30970 
[MIRROR] Enables meteors to qdel normally, saving actual seconds of time spent harddeleting them otherwise
 2017-09-24 09:36:50 -04:00
LetterJay
ac8e74e517 Update freezer.dm 2017-09-24 08:35:36 -05:00
vuonojenmustaturska
d111c582b4 Meteors can now qdel normally (#30970) 2017-09-23 23:35:14 -05:00
Iamgoofball
60bdb54024 You can now Indiana Jones one explosion. 2017-09-23 23:34:04 -05:00
jughu
617eb4c889 The new hip 2017-09-24 01:04:39 +02:00
jughu
5b1b550c0e Update holy_weapons.dm 2017-09-24 00:34:24 +02: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