321 Commits

Author SHA1 Message Date
quotefox 20d4541541 lips and lip fleshlights 2022-09-09 23:38:37 +01:00
quotefox a205b47acb Barber fixes do_mob() 2022-09-09 02:21:16 +01:00
quotefox c11dd11cbb Scissors now show progress bar properly. 2022-09-09 02:17:05 +01:00
Dahlular 027f9d8c92 Merge pull request #1657 from Dahlular/second-warning
Ports green Ordeal mobs from LC13
2022-09-06 18:26:15 -06:00
Dahlular 3245c4a52e Ports green Ordeal mobs from LC13 2022-09-06 18:21:02 -06:00
Dahlular 671e01b073 I HATE ACTIONS IM USING SPELLS NEXT TIME 2022-09-06 15:39:45 -06:00
Dahlular bc9bd3c53f putting this aside, map fixes 2022-09-06 15:08:52 -06:00
Dahlular d716d437d2 I'll finish this later 2022-09-05 19:16:47 -06:00
Moltov bdbff7a90a Im helping
removed applyinateeffects, after_spawn grants dash instead. Dash is not working,
2022-09-05 14:24:50 -04:00
Dahlular 08475e64d6 MOLTOV HELPPPP 2022-09-05 11:23:22 -06:00
Dahlular bf84a1ce50 this too 2022-09-05 10:46:19 -06:00
Dahlular 4c1b2e9a20 working on aspects and more smoothing 2022-09-05 10:29:31 -06:00
Dahlular f45b4bfb4c MultiZ Layenia Base 2022-09-04 10:32:31 -06:00
quotefox 166f7a29b1 Can now remove genital equipment from other people.
Can now remove genital equipment from other people. + bug fix with limiter
2022-07-13 23:41:02 +01:00
quotefox 4cc2103d2b Cock rings + Limiter
Includes base code to allow penis equipment
2022-07-13 10:56:24 +01:00
Dahlular b487573064 Revert "Finally, MultiZ Layenia" 2022-07-09 13:52:49 -06:00
Dahlular e51460cb5d Revert "Merge branch 'master' into fairylights"
This reverts commit 2947727659, reversing
changes made to 91063fe882.
2022-07-09 04:55:33 -06:00
Dahlular 2947727659 Merge branch 'master' into fairylights 2022-07-09 02:53:32 -06:00
Dahlular 0cc2229789 Revert "Ports tgstation's Color Standardization, adds Color Defines and Signals" 2022-07-06 17:15:00 -06:00
Dahlular eaaca202a6 Revert "(CONFIG CHANGE) Updating Economy: Adding Paychecks, and makes Bank Accounts easier to work with" 2022-07-06 16:38:30 -06:00
Dahlular c7c6e2d193 Merge branch 'master' into economy-update-junk 2022-07-06 16:28:45 -06:00
Dahlular b103b5fa9a Merge pull request #1629 from DragonTrance/more-colors
Ports tgstation's Color Standardization, adds Color Defines and Signals
2022-07-06 15:44:41 -06:00
Dahlular ca592d1e1e I'm gonna assume this is a mistake 2022-07-06 15:41:37 -06:00
Archie 26c33b2403 Fixing Poss Voidsuits 2022-07-03 23:38:43 -03:00
DragonTrance 7bae2a36ee config junk 2022-06-09 17:54:40 -04:00
DragonTrance a256ef54c0 changes the price of everything to scale w/ pay 2022-06-08 18:38:41 -04:00
DragonTrance bbbb50dfe0 limits ID cards to one account 2022-06-08 17:54:15 -04:00
DragonTrance 972d3f5e19 fixing shit, todo: accounts for anyone 2022-06-08 17:18:54 -04:00
DragonTrance 66e0cb72b9 reworking economy, adding paychecks 2022-06-08 12:30:17 -04:00
QuoteFox 8efeb5665e Merge pull request #1632 from DragonTrance/mm-chiggen
examine this cock
2022-06-08 04:26:08 +01:00
Dahlular ee3260b973 Merge pull request #1613 from Oposshim/Donk-2
Donk Stocks 2
2022-06-07 08:36:26 -06:00
DragonTrance 8631b739c8 *grammatically examines cock* 2022-06-06 15:20:01 -04:00
DragonTrance f3fe268d0c Ports color standardization
from tg/52574
2022-06-06 11:58:34 -04:00
ProbablyCarl a9a3fd1f4f lol no 2022-05-15 06:06:01 -04:00
ProbablyCarl 1e8570c578 initial 2022-05-15 04:50:41 -04:00
Dahlular c297f5c141 Merge remote-tracking branch 'upstream/master' into markings-and-more 2022-05-14 22:07:39 -06:00
Dahlular f6ee04ecdc fix and full addition 2022-05-14 22:03:45 -06:00
sarcoph 10ce1d1a41 hotfix 2022-05-14 11:52:57 -08:00
sarcoph 694fe4a3f2 alphabetization 2022-05-14 11:44:31 -08:00
sarcoph 594b1e20f5 black and white visors 2022-05-14 11:41:24 -08:00
sarcoph 927cb879f2 IPC visor screens 2022-05-14 11:23:52 -08:00
sarcoph a2d6d4561c makes ipc organs craftable 2022-05-14 02:39:06 -08:00
sarcoph b4163be383 replacing IPC eating with APC siphoning
oracle port
2022-05-14 02:06:56 -08:00
sarcoph f45e803bd0 IPC randomization and toggleable markings 2022-05-13 05:09:32 -08:00
sarcoph 431b48d344 cosmetic part ids and jointed ipc components 2022-05-13 04:10:34 -08:00
sarcoph fecbd2c77c ipc screens 2022-05-13 01:56:46 -08:00
sarcoph a6f788c7cd Update sprite_accessories.dm 2022-05-13 00:22:04 -08:00
sarcoph 94059fdb16 antennae 2022-05-12 23:20:10 -08:00
sarcoph 9e8952142f matrixed bodyparts and sleek ipcs 2022-05-12 12:00:59 -08:00
sarcoph 112159200f hotfix 2022-05-12 01:11:54 -08:00