Commit Graph

2303 Commits

Author SHA1 Message Date
ReoDaProtovali 4a92821583 I think that's about everything. 2024-11-16 21:44:12 -06:00
sheepishgoat 81d700f1a7 Merge pull request #14 from sheepishgoat/fixes-and-maps
plentitude of small fixes
2024-10-30 14:15:55 -04:00
OzzyMcpseudonym fd8289485c Loadout mod grey suit on dev this time. 2024-10-21 14:03:53 -04:00
evilew 47d2d2bc79 small tweaks
- brought back fat jacqueen sprites
- added modular suits and flowers to loadouts
- nerfed electrical storms
2024-10-15 14:22:21 +02:00
AlManiak 854a0cf4b4 Initial commit of a working state 2024-10-13 22:48:31 +02:00
Elizabeth Lavenza 0b4dcfd73a Fix invalid gun overlays 2024-04-16 02:19:41 -04:00
Elizabeth Lavenza 174aca4b01 Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 18:06:52 -04:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 6733de69bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks 2023-12-29 23:16:11 -03:00
deathride58 ce1d757159 Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
SandPoot b9a422ee2d throw at mobs laying down 2023-12-18 14:07:25 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot f626df9d1d push 2023-12-13 00:08:58 -03:00
SandPoot a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Lin 559288df78 Merge pull request #16010 from SandPoot/me-when-loadout-code
Fixes donator backpack items
2023-10-07 22:09:35 -04:00
SandPoot 4429bce1e1 yeah 2023-10-07 14:36:26 -03:00
SandPoot af33de25b4 the commit 2023-10-03 14:22:05 -03:00
Timothy Teakettle 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
SandPoot 9e2851b76b donator. 2023-02-06 20:01:47 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
LetterN d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08:00
Lin 6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat
Adds the Polychromatic Cowboy Hat
2023-01-18 18:11:21 -07:00
Darius aa1b82f0b1 Convert Colorist from quirk to loadout item
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
2023-01-11 14:23:14 -05:00
Darius a8b7cd9c4a Adds the Polychromatic Cowboy Hat
Adds a new polychromatic variant of the white cowboy hat.
2023-01-10 20:40:01 -05:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Hatterhat 1e1cce6e86 forgor 2022-12-24 11:38:06 -06:00
Hatterhat c54ed0ceda overstepped the scope tbh 2022-12-24 01:44:03 -06:00
Lin 723decec2b Merge pull request #15882 from Citadel-Station-13/silicons-patch-16
updates kate walker's donator item
2022-12-12 19:13:42 -07:00
Cognition b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
silicons 5b954558da Update __donator.dm 2022-11-03 22:50:56 -07:00
Lin 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
zerothebigboy 44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00
LetterJay 64bcd694c1 donator blah blah, my head hurts 2022-07-18 00:20:33 -05:00
Timothy Teakettle c025a4f36e commit names arent important right? 2022-06-02 20:40:21 +01:00
Timothy Teakettle dad0aa72f0 OH BOY 2022-06-02 19:18:11 +01:00
TrojanCoyote 024e4dade1 Adds kitsune masks to loadout options
black and white kitsune masks go into loadout
2022-05-31 07:48:26 -05:00
SandPoot da1f58f297 Update files 2022-05-19 13:23:17 -03:00
SandPoot 5dad84a486 Update files 2022-05-16 21:44:25 -03:00
Lin f2ca3a067d Merge pull request #15617 from timothyteakettle/timothyteakettle-patch-1
poly alt cloak can now be renamed/dedescriptioned in loadout
2022-05-16 02:31:01 +00:00
Timothy Teakettle 3157a11209 Update neck.dm 2022-05-13 15:36:05 +01:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
silicons dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
BlueWildrose 3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00