1a92134ad3
b
2019-07-25 21:43:02 -04:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
c012418cf7
Merge pull request #8734 from Ghommie/Ghommie-cit84
...
Sort of porting "Changes the type pathing of some "random" items"
2019-07-12 07:43:12 -07:00
92fadcf230
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84
2019-07-11 09:07:11 +02:00
ba7c24a0ec
Refactoring underwear to allow custom color preferences.
2019-07-09 23:25:54 +02:00
490ae9daf2
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-09 07:58:22 +02:00
bce4ce31ab
Merge pull request #8778 from Ghommie/Ghommie-cit97
...
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
9d6c930b2c
owo
...
Wat dis?
2019-06-30 15:47:45 -04:00
ad3b709c40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
2019-06-29 06:39:21 +02:00
0371a5513a
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-06-29 06:03:57 +02:00
a6caf4c63f
Merge pull request #8729 from Ghommie/Ghommie-cit79
...
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
a2d896351b
Sort of porting "Changes the type pathing of some "random" items"
2019-06-23 07:10:11 +02:00
38bc8a4efd
Ports "Removes SSreligion"
2019-06-23 01:45:21 +02:00
b85d4d6fb3
Sort of porting MRE rations from Yogstation.
2019-06-22 16:05:03 +02:00
e83365daed
Added a penis autosurgeon as rare maint loot
2019-06-08 17:12:51 -04:00
2f2885f1d6
Merge pull request #8558 from Ghommie/Ghommie-cit35
...
Ports in the container_type to reagents flags refactor.
2019-06-08 01:26:28 -07:00
1488af1a52
Merge pull request #8554 from Ghommie/Ghommie-cit33
...
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
2019-06-08 01:24:59 -07:00
7aac9e6280
Updates reagents a bit.
2019-06-07 06:27:04 +02:00
0b53df47de
Enough clowning around.
2019-06-07 03:22:26 +02:00
5482469a86
Added lightup shoes and heelys to maint loot
2019-05-30 13:02:18 -04:00
1557c33008
Adds Penis Enlargement Pills
2019-05-02 14:55:04 -07:00
4761d9d7f3
Makes OOC and LOOC actually use different toggles
2019-03-19 20:18:15 -04:00
4e00f59d82
Adds the ability to allow specific ckeys to bypass the panic bunker for a given round
2019-02-27 07:46:34 -05:00
4c7075f1a8
New medals added.
...
add: Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
d255295cc2
Merge pull request #7612 from deathride58/imalwaysaslutformorememory
...
Mirrors tgstation/tgstation#40662 (100mb memory freed up roundstart, hell ya)
2018-10-03 22:33:16 -05:00
595d4c3504
Alternative Miner Suits ( #7611 )
...
* haha what the fuck this took like a solid 6 hours
* allows new suits to spawn on legion corpses.
* Update flags.dm
* Fix conflict maybe
* pls work
* im a big gay
2018-10-03 20:32:25 -07:00
0ce450eab8
tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory
2018-10-02 19:36:21 -04:00
bc0d14c193
Continual updates until merged
2018-09-17 04:55:03 -05:00
bb13e70d32
globalvars
2018-09-11 00:58:01 -05:00
586b27d489
adds antag ooc ( #7477 )
2018-08-23 00:25:27 -07:00
2a6e4fce59
Photography Update
2018-07-20 15:26:13 -07:00
f1739cb482
Upstream fix mirror spree ( #7362 )
...
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable
* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms
* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink
* tgstation/tgstation#38988 - Fixes blob victory.
* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button
needs tgui recompile
* tgstation/tgstation#38994 - Fix timer bug
* TGUI recompile
* tgstation/tgstation#39035 - Fixes navigation computers.
* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime
* tgstation/tgstation#39044 - Fixes burgers icons
* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations
* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero
* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo
* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
63013f8964
everything to controllers
2018-07-02 00:10:31 -04:00
03a22ca16d
[MIRROR] Transit space refactor ( #7130 )
...
* Transit space refactor
* Update bitfields.dm
2018-06-18 11:51:02 -07:00
de68aa9571
Individual Logs now follow the client around automatically ( #37790 )
...
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round
The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob
A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
2018-06-06 04:10:20 -05:00
83ac5852dd
Turn /datum.isprocessing into a datum flag ( #38193 )
2018-06-05 18:00:21 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
1d1dc1aca8
Disallow effects from being scanned by the chameleon projector ( #38017 )
...
* henk
* iseffect
2018-05-25 07:38:01 -05:00
6a575f19d1
Merge branch 'master' into upstream-merge-37597
2018-05-22 07:21:53 -05:00
931a950adb
Merge branch 'master' into upstream-merge-37486
2018-05-21 08:59:32 -05:00
a61457cd47
Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
...
Query debug logging
2018-05-17 21:38:41 -05:00
1a25c685a1
Update DMAPI to version 3.2.1.0
2018-05-08 21:33:58 -05:00
50f8779fc0
Merge branch 'master' into upstream-merge-37486
2018-05-06 07:15:48 +00:00
309b992371
Update bitfields.dm
2018-05-06 03:09:17 -04:00
0958d35b26
replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-02 13:14:43 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
Sishen