Commit Graph

264 Commits

Author SHA1 Message Date
kevinz000
274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-03-08 11:10:30 -07:00
Ghommie
a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
ancientpower
5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
ancientpower
23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00
ancientpower
12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
Ghommie
ecf125477f fixing a couple silicon privileges runtimes. Also .dme alphabetic order 2020-02-27 13:11:14 +01:00
Ghom
bfe3bbb6d5 Update paramedic.dm 2020-02-27 12:34:13 +01:00
Detective Google
569ea6bd61 unfucks paramedics access + PDA 2020-02-24 16:36:45 -06:00
Detective-Google
0caed52ca5 removes the epic and cool access and makes it less epic and more cool 2020-02-24 03:28:33 -06:00
Detective Google
141bd96430 man FUCK psychs 2020-02-20 22:46:37 -06:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghom
2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
ancientpower
937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Ghommie
32ee2f6197 minor pet peeve with the anomalous honking crystal & co. 2020-01-24 21:51:24 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
BlackMajor
08d042901c thank you github 2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1 Merge branch 'master' into Yeehaw 2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d Sync 2020-01-02 22:02:55 +13:00
BlackMajor
b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
Putnam
7947f06557 Made sure ghost cafe visitors don't get midround antags 2019-12-28 13:56:03 -08:00
Ghommie
88978209fa Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly" 2019-12-19 16:42:25 +01:00
Ghommie
0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Ghommie
65245dafed Fixes ai displays status being reset to "Neutral" on login. 2019-11-29 04:07:56 +01:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Ghommie
c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
2019-11-14 16:38:27 -07:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie
d2b1ce4181 Unused. 2019-11-09 23:05:16 +01:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie
ad0e8ec4be Yea, all good now. 2019-11-02 13:41:20 +01:00
Ghommie
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Poojawa
4820efd047 Merge branch 'master' into access-clarifications 2019-10-25 22:24:56 -05:00
Ghommie
2a07bf95d8 Unmodularize job types 2019-10-24 22:44:40 +02:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
Ghommie
17191c5e22 mimes. 2019-10-18 18:23:27 +02:00
Ghommie
9981eb916a clowns. 2019-10-18 18:16:11 +02:00
Ghommie
69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Poojawa
bd66219767 Clarifies ID Console descriptions 2019-10-13 03:06:22 -05:00
kevinz000
6fc746a5af Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
2019-10-08 00:30:54 -07:00
TrilbySpaceClone
45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
Fermi
40bac8c807 t 2019-09-19 14:44:12 +01:00