Commit Graph

264 Commits

Author SHA1 Message Date
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
cb342866d6 a few last minute changes from TG
also changes His Grace from 25 to 10 requirments
2018-09-18 23:12:29 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
deathride58
7a6f8ef5a3 Merge pull request #7492 from Tupinambis/Flukies
Nuclear Operatives are no longer exclusively human
2018-08-26 21:23:11 -04:00
Tupinambis
a4855f14d0 return TRUE 2018-08-23 20:48:55 -05:00
Tupinambis
750f97444e Nuclear Operatives are now able to be any roundstart species except plasmamen. Snowflakes rejoice. 2018-08-23 18:09:07 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
kevinz000
53df5ec85d Update revolution.dm 2018-08-16 17:36:19 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
deathride58
4ae3bff79a Merge pull request #7266 from Citadel-Station-13/kevinz000-patch-7
stops admins from "accidentally" ending the round by elder god
2018-07-06 01:35:51 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
727aa6b2a9 Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745
[MIRROR] Fixes not receiving AI destroy objective during IAA
2018-07-01 09:32:39 -05:00
LetterJay
3dfeb02512 Merge pull request #7245 from Citadel-Station-13/upstream-merge-38697
[MIRROR] Improves machine overload logging
2018-07-01 09:25:40 -05:00
kevinz000
8c71bbe36b Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:44:11 -07:00
kevinz000
4bddef70e2 Update ark_of_the_clockwork_justicar.dm 2018-06-26 17:43:52 -07:00
kevinz000
8975695b54 Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:43:19 -07:00
kevinz000
df68eb864a Update ratvar_the_clockwork_justicar.dm 2018-06-26 17:39:59 -07:00
Nich
4bbb592e12 Fixes IAA AI destroy objectives (#38745) 2018-06-26 17:02:24 -05:00
Jordan Brown
6579450176 Merge pull request #38697 from DaxDupont/a
Improves machine overload logging
2018-06-25 09:15:25 -05:00
Jordan Brown
c97abeaf09 Merge pull request #38696 from Tlaltecuhtli/patch-53
fixes a cult message.fixes a cult message.
2018-06-25 09:15:17 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130)
* Transit space refactor

* Update bitfields.dm
2018-06-18 11:51:02 -07:00
CitrusGender
ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461)
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
2018-06-18 09:37:35 -05:00
LetterJay
d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424
[MIRROR] Removes doubled iaa definition.
2018-06-12 08:08:39 -05:00
Jordan Brown
adf4cad9ea Merge pull request #38424 from AnturK/iaafixup
Removes doubled iaa definition.
2018-06-11 22:30:26 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-11 22:29:27 -05:00
AnturK
6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049)
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
2018-06-10 12:30:00 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
deathride58
bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116
[MIRROR] Refactor machinery to default to being anchored
2018-06-05 23:37:20 +00:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
81Denton
a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 2018-06-05 13:17:12 -05:00
LetterJay
8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220
[MIRROR] Fixes pocket items being deleted when monkeyizing
2018-06-03 16:19:36 -05:00
LetterJay
73d1abed5c Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199
[MIRROR] fixes a locate and adds job checks to download objective
2018-06-03 10:42:27 -05:00
LetterJay
7b7420dec6 Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250
[MIRROR] [s]Fixes bloodcult exploit
2018-06-03 10:42:16 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
Nich
b38f42f989 Fixes a locate and adds job checks to download objective (#38199) 2018-06-03 09:03:23 -05:00
kevinz000
217dfc0d53 Fixes exploit (#38250) 2018-06-03 09:03:15 -05:00
Tad Hardesty
95bbfb29d1 Fix mecha mouse pointer issues (#38213)
* Fix mecha mouse pointer issues

* Migrate ranged ability mouse pointers to new system
2018-06-03 09:03:06 -05:00
LetterJay
5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175
[MIRROR] Removes drone overlays and the associated code
2018-06-02 07:45:00 -05:00
LetterJay
55720bd218 Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170
[MIRROR] Fixed the clockwork helmet not dropping to the ground when used by a non-clock cultist like the other clock armor pieces do.
2018-06-02 07:32:31 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
theo2003
d45724f12b Fixed the clockwork helmet so it drops to the ground when used by a non-clock cultist like the other clock armor does. 2018-06-01 10:20:40 -05:00
Jordan Brown
876e8ec713 Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors
Set cult floor effects to be on the floor plane
2018-06-01 09:50:58 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00