f9353da855
Quote the armor lists
2018-02-16 00:26:26 -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
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
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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -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
63aa1c7153
Makes the pda font a prefernce
2017-10-04 19:28:57 -05: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
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
4d2fe460ed
Nightmare
2017-09-11 16:23:47 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
4fbdf9851d
Fixes a drone ping issue
2017-07-21 18:19:49 -05:00
f893863397
[MIRROR] Refactors speech/communication logging and adds coordinates to speech logs ( #1905 )
...
* Refactors speech/communication logging and adds coordinates to speech logs
* Update clockwork_slab.dm
* Delete clockwork_slab.dm.rej
* Update browserOutput.dm
* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
45fd6a1447
Fixes PDA runtime href exploit ( #1868 )
2017-07-04 15:47:06 -07:00
926589fd58
Update PDA.dm
2017-06-27 05:11:06 -05:00
68d8b76dec
PDA Refactor Part 1: Phantom Blood Menace
2017-06-23 21:59:22 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
a544d99f9f
cleanup and commits
2017-06-19 12:35:05 -05:00
4bd99124de
Adds F.R.A.M.E. cartridge
2017-06-10 12:18:31 -05:00
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
f2730839d4
Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
...
[MIRROR] Refactors explosions
2017-05-30 15:15:51 -05:00
4b9a7ce9cf
Adds AI follow links to PDA messages and holopad speech
2017-05-28 08:14:21 -05:00
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
Jordan Brown