Commit Graph

1580 Commits

Author SHA1 Message Date
kevinz000 9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
kevinz000 1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000 350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000 1acac87da3 compile 2020-01-15 23:54:30 -07:00
kevinz000 b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
kevinz000 b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000 f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000 830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000 e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000 2a304800df more reformatting 2020-01-07 11:46:32 -08:00
kevinz000 ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000 c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000 a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
kevinz000 1f2597784f git commit death 2020-01-05 15:40:23 -08:00
Ghom 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
Ghom 3d8c329223 Kevinz, pls 2020-01-04 13:52:17 +01:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
kevinz000 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000 f920e7b73c changes 2019-12-31 10:08:14 -08:00
Seris02 9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000 7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
2019-12-30 00:17:46 -08:00
kevinz000 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
kevinz000 3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
2019-12-30 00:07:32 -08:00
Ghommie edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Seris02 3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Lin d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
Commandersand 60905cc09b loadout 2019-12-27 12:44:08 -06:00
Ghom 5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
2019-12-27 13:27:04 +01:00
Ghom 05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
2019-12-26 16:11:54 +01:00
Hatterhat f3fed71e08 ah, the wonders of atomization 2019-12-24 21:28:32 -06:00
Hatterhat 681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
Ghommie e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Lin 9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator
Donator Item - Ready For Review
2019-12-23 05:29:06 +00:00
deathride58 2eaffd57c3 Update custom_items.dm 2019-12-22 23:16:40 -05:00
LetterJay 632e2cd8a1 Update custom_items.dm 2019-12-22 14:37:58 -06:00
LetterJay 98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-22 14:37:10 -06:00
LetterJay 28e909ad74 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-22 14:37:05 -06:00
LetterJay 1d933dd0f3 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-22 14:37:00 -06:00
LetterJay 4def28ddf9 Update __donator.dm 2019-12-22 14:16:40 -06:00
Seris02 18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Jay 29b25841b9 FUUUUUUUUUCK v2 2019-12-21 20:58:50 -06:00
Jay 4730413431 FUUUUUUUUUUUCK 2019-12-21 18:05:34 -06:00
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Michiyamenotehifunana 3920e6a38d Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis 2019-12-21 22:22:12 +08:00
Michiyamenotehifunana 0b2568a9cf Modernizes Polychromic Uniform Code
No more modular_citadel, but the neck polychrome crap needs more work in another PR
2019-12-21 21:38:04 +08:00
kevinz000 97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
2019-12-20 23:20:49 -07:00
Putnam c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00