a60410b347
Merge pull request #35557 from ShizCalev/pda-virus-fix
...
Fixes PDA virus runtime
2018-02-12 16:32:07 -06:00
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
51e4d9f9db
All color inputs use current color as default choice
2018-01-24 18:14:16 -06:00
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
ebfc1c3d9c
Cleans up some redundant stripped_input usage
2018-01-16 14:32:25 -06:00
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
406ccb256f
Fixed PDAs not calling parent in equipped() ( #34081 )
2018-01-05 05:59:54 -06:00
e6ec24d13c
Merge branch 'master' into mapsyncs43293845982
2018-01-05 02:03:51 +00:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
a227ddf3c1
Merge pull request #34025 from DaxDupont/PDAColor
...
PDA Interface color is now a preference.
2018-01-03 21:12:09 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
ffb04fd070
Removes syndicate door access from Captain's PDA cartridge. ( #33635 )
2017-12-18 21:22:21 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
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
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
3bff5f4cd6
Update PDA_types.dm
2017-12-05 17:43:52 -05:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
1d4e3612ea
Update PDA.dm
2017-11-22 17:56:49 -05:00
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
060d43768e
Merge pull request #31836 from AnturK/pdalogfix
...
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
482e61a57e
Adds Toggle Underline button to PDA menu ( #31604 )
...
* Add Toggle Underline button to PDA.dm
-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.
* Changed 1/0 to bools
Now using TRUE and FALSE, also cleaned some HTML I missed the first time
2017-10-13 16:51:44 -05:00
39d3897b29
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-06 09:39:20 -04:00
63aa1c7153
Makes the pda font a prefernce
2017-10-04 19:28:57 -05:00
8e65f4fb23
Merge branch 'master' into crewobjectivesandmiscreants
2017-10-01 23:45:49 +00:00
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
595f2cb08f
Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985
...
[MIRROR] Fixes frozen PDAs in the game logs
2017-09-29 01:39:50 -04:00
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
c6c6f67d03
Applying PDA overhaul Upstream ( #30613 )
...
* Applying PDA overhaul Upstream
Yeet?
* Used lordpidey's change
Like this?
* The build failed so I'm changing it back
* Update PDA.dm
* Update PDA.dm
* Make the settings visible only on the main screen
mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.
* Update PDA.dm
* Update PDA.dm
* Wait, I'm an idiot. I was editing the wrong thing.
* Here's your switch statements boi
* Declare font_index at the "Toggle_Font" code
I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.
* Replaced it where it was
cuz the build broke
* Make the color changer a picker instead of a field
An attempt
* Made these defines
@optimumtact @Cyberboss Like this?
2017-09-28 21:43:32 -05:00
367fcc9974
Merge pull request #30985 from tgstation/Cyberboss-patch-5
...
Fixes frozen PDAs in the game logs
2017-09-28 21:42:20 -05:00
9bdc80ba82
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-09-27 23:44:22 -04:00
d8a1fc936e
[MIRROR] Stops AIs from taking actions while depowered ( #2813 )
...
* Stops AIs from taking actions while depowered
* Update ai.dm
2017-09-18 01:45:59 -05:00
d96f3f40a5
[MIRROR] PDA game log entry contains ckey ( #2808 )
...
* PDA game log entry contains ckey
* PDA game log entry contains ckey
2017-09-17 11:58:11 -05:00
c4e3b778b3
Merge branch 'master' into crewobjectivesandmiscreants
2017-09-17 02:26:07 +00:00
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
053b283745
Fixes initialize hints for a fair number of mobs and items
2017-09-11 12:20:19 -05:00
44e62d8016
Uplink lock codes now pick from the phonetic alphabet global list ( #30538 )
...
* Uplink lock codes now pick from the phonetic alphabet global list
* Update virus_cart.dm
2017-09-10 14:17:16 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
8ef2b39d44
adds clown slip objective
2017-09-06 18:34:05 -04:00
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
vuonojenmustaturska