f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01: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
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01: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
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01: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
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01: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
a2d896351b
Sort of porting "Changes the type pathing of some "random" items"
2019-06-23 07:10:11 +02:00
b85d4d6fb3
Sort of porting MRE rations from Yogstation.
2019-06-22 16:05:03 +02:00
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
e83365daed
Added a penis autosurgeon as rare maint loot
2019-06-08 17:12:51 -04: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
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
ac8b7be45c
Merges old penis enlargement pills into prexisiting Fermichem ones. (master ( #8319 ) by BurgerLUA)
2019-05-10 03:10:42 +01:00
1557c33008
Adds Penis Enlargement Pills
2019-05-02 14:55:04 -07: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
bb13e70d32
globalvars
2018-09-11 00:58:01 -05: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
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
50f8779fc0
Merge branch 'master' into upstream-merge-37486
2018-05-06 07:15:48 +00: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
38ae8beefc
[READY]AI latejoins
2018-04-06 00:44:31 -05:00
eb5936c48b
Merge pull request #36927 from 81Denton/moff-name-variety
...
Adds more moth names to prevent duplicate random names
2018-04-03 22:02:47 -05:00
6c7da493d9
Reee mirror bot. Hard syncs some missed PR stuff + maps ( #5951 )
...
* maps and tgui
* missed defines and helpsers
* controller things
* datums
* game folder stuff
* module things
* icons
* stragglers
* map sync and updating
wew lad
2018-03-14 16:49:40 -05:00
91d1aa5a74
Update flavor_misc.dm
2018-03-08 01:02:29 -05:00
e559fdca2c
Mushroom people, revived!
2018-03-07 21:47:42 -06:00
a2e6253f00
[MIRROR] Disease antagonist ( #5815 )
...
* Disease antagonist
* Update mobs.dm
* can I go to sleep yet
2018-03-05 15:20:59 -06:00
30a4705c01
[MIRROR] Clean up all sorts of crap, mostly defines ( #5788 )
...
* Clean up all sorts of crap, mostly defines
* fixes compile errors
2018-03-05 13:23:28 -06:00
3e12e1b2f6
Some antag fixes. ( #35690 )
...
* Removes misleading comment
* Fixes devil ascension visible in lobby
* Fixes nuke op reinforcements.
* ADVANCED COPYPASTE
* Missed this one.
2018-02-16 10:35:55 -06:00
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
4451aca2e8
Refactor weather to use Z traits, assorted related cleanup ( #34633 )
...
* Add a proc for getting the station center
* Add a couple of comments to ZTRAIT defines
* Remove unused global_map list
* Refactor weather to use the trait system
* Un-hardcode the transit z-level
* Use Z traits to determine Portal Storm event areas
* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
4826dec880
Adds holy vision (Some mobs can now see blessed tiles) ( #34497 )
...
* Blessed turfs are visible to people who care about blessed turfs
* A better way
* Adds holy vision
* Compacts special types
* space space space
* Glowing
* Final Solution
* wraith
* bawhoppen has autism and we must hugbox
* Implements feedback
2018-01-21 02:04:47 -06:00
93f00d4a0f
Merge pull request #33958 from XDTM/Morpheus
...
Dreaming Improvements
2018-01-13 04:21:50 -06:00
72319a9794
Replace hardcoded z-level numbers with a trait system
2018-01-11 14:06:17 -06:00
af96f58ffd
syncs defines
2018-01-03 23:15:49 -05:00
8cbad06f35
Advanced mob laziness
2017-12-17 19:36:04 -06:00
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
20014e6f44
Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants
...
Adds spawn override system
2017-11-25 16:37:46 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
Thalpy