Commit Graph

68 Commits

Author SHA1 Message Date
silicons 2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons 19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
silicons 184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons 910869d6bf more 2020-07-18 19:44:12 -07:00
Ghommie a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
kevinz000 7ec669ecd4 bet 2020-04-07 16:11:58 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghommie 84d9430ee4 PC too slow for compile. 2020-02-03 07:21:39 +01:00
Ghommie 81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Artur 8bb0e30036 Initial Commit V3 2020-01-31 18:17:14 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Useroth a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
Chayse Ramsay f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay 46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Chayse Ramsay a0a21dc01f !iscarbon to !ishuman 2019-08-03 18:36:46 +01:00
Chayse Ramsay 5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
Poojawa 07cb9572bd Onclick 2018-09-11 01:33:01 -05:00
Cruix 9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
deathride58 50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
Jordan Brown 62d6329f56 Condenses a check 2018-04-29 10:03:39 -05:00
vuonojenmustaturska 3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
Poojawa f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
CitadelStationBot 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Qustinnus a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
CitadelStationBot 0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724)
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
2018-02-27 05:04:00 -06:00
deathride58 09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
CitadelStationBot f02529555c [MIRROR] Fix roundend splash screens (#5242)
* Fix roundend splash screens

* Update screen_objects.dm
2018-02-02 01:22:56 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Tad Hardesty 06120d3174 Grammarize the internals screen object 2018-01-13 04:36:43 -06:00
LetterJay 6a1c0f6683 Update screen_objects.dm 2017-11-07 03:24:40 -06:00
Jordan Brown a4665bc7cd Fixed required images being in the config folder 2017-11-03 23:35:06 -05:00
Poojawa 62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot 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
Jordan Brown f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
ShizCalev 20c5749416 Cleans up leftover Hand of God gamemode references 2017-10-05 18:17:21 -05:00
LetterJay 39ef613076 Update screen_objects.dm 2017-10-02 19:37:03 -05:00
KorPhaeron 3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000 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
kevinz000 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
LetterJay a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381)
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00