Commit Graph

66 Commits

Author SHA1 Message Date
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Seris02 e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Seris02 934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
Seris02 74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Ghommie 5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Seris02 04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 ce1dabb585 Merge pull request #10513 from r4d6/open-message
Add a message when pulsing the open wire on airlocks
2020-01-12 00:37:33 -08:00
r4d6 96c75eb5ca Add a message when pulsing the open wire on airlocks 2020-01-10 17:01:46 -05:00
kappa-sama b3e916cc68 e 2020-01-08 09:44:16 -05:00
kevinz000 5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
Ghommie 19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
Ghommie b83f92be0e Unmodularize airlocks. 2019-11-13 06:50:35 +01:00
kevinz000 aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
BurgerLua b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
Seris02 59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Ghommie 2e30b91567 Ports in microwave updates and its radial menu. 2019-06-23 06:10:49 +02:00
deathride58 c8d51c4231 Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time 2019-04-02 01:11:29 -04:00
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
LetterJay 1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
ShizCalev 4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
vuonojenmustaturska 36b3cbe4bf Removes a couple thousand empty lists (#38000)
door.shockedby
2018-05-23 21:15:41 -05:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Dax Dupont e748439b15 Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379) 2018-04-24 08:14:12 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
ACCount f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58 d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
FrozenGuy5 65dbabab89 Prevents the PA wires from being EMP'd (#33199)
* returns emp_act

* jordie for code owner
2017-12-02 09:43:42 -06:00
Jordan Brown bd69a59bad Merge pull request #32417 from YPOQ/empwirefix
Fixes EMP wire pulsing
2017-11-05 12:03:42 -06:00
LetterJay 5ae1b16d6c Update airlock.dm 2017-10-16 20:52:19 -05:00
Leo 416816cd5f Add a safety check for usr in airlock shocking 2017-10-16 16:48:21 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay 7193e9da83 Update wires.dm 2017-09-30 14:25:29 -05:00
vuonojenmustaturska 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00