Commit Graph

197 Commits

Author SHA1 Message Date
kevinz000
41191c3974 trauma 2020-01-20 19:01:11 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
kevinz000
e16b61b865 Merge pull request #10043 from Arturlang/patch-1
PDA cartridges and their contents can no longer be contaminated
2019-12-05 21:58:33 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Arturlang
138847838a I suppose 2019-12-04 21:17:49 +02:00
Arturlang
7d3103a260 Done 2019-12-04 15:02:36 +02:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13: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
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01: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
Ghommie
322c90fab2 Mistake I have done when copypasting. 2019-11-14 13:32:57 +01:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie
d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +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
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Ghommie
69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Ghommie
ff451c8cf4 I don't want to send emoji assets to every machine interfacing with PDA messages.
Just the chat tab.
2019-09-22 14:50:37 +02:00
Ghommie
bf2f4b5df1 Enables emojis for PDA messages. 2019-09-21 22:42:06 +02:00
Winter Flare
141a93236c Service QoL
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
2019-08-14 04:01:18 -04:00
kevinz000
d61732472c Merge pull request #8831 from Ghommie/Ghommie-cit115
Holographic PDA Quickfix!
2019-07-07 11:08:15 -07:00
kevinz000
1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
Ghommie
00879a6e28 Holographic PDA Quickfix! 2019-07-06 03:46:01 +02:00
kevinz000
ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
2019-07-03 13:47:53 -07:00
Ghommie
b2c5e002ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94 2019-07-03 02:50:49 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02:00
Ghommie
513f0af0fa turns out the curator cartridge already had an (unused) sprite. 2019-06-28 17:14:57 +02:00
Ghommie
180ab72b78 more changes. 2019-06-28 03:45:42 +02:00
Ghommie
8d9832938f New sprites for the curator, lawyer and roboticist pda cartridges. 2019-06-28 03:31:46 +02:00
Ghommie
67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
Ghommie
df9c4fd1f4 [s] Ports "Fixes PDA TK exploits" 2019-06-19 03:08:44 +02:00
Ghommie
b4ccfe078a snap 2019-06-10 00:35:57 +02:00
Ghommie
79c4ce502e more pda skins. 2019-06-10 00:28:43 +02:00
Ghommie
cce9c87af7 shower ideas. 2019-06-09 20:46:37 +02:00
Ghommie
88ab1794a6 lazylen 2019-06-09 20:00:54 +02:00
Ghommie
d2e216f2de tested fixed tested fixed tested. 2019-06-09 19:55:08 +02:00
Ghommie
480ee9a9da Reskinnable PDAs. 2019-06-08 19:55:47 +02:00