Commit Graph
917 Commits
Author SHA1 Message Date
kevinz000andGitHub d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
kevinz000andGitHub 7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707
VR Levels are not a subset of Away Missions anymore.
2020-04-25 16:51:52 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Putnam3145andGitHub 45f032a600 Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
2020-04-21 13:04:31 -07:00
kevinz000andGitHub ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
Ghommie 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
GhomandGitHub 7a47debe9e Merge branch 'master' into Ghommie-patch-1 2020-04-18 01:27:00 +02:00
kevinz000andGitHub 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
GhomandGitHub e0248d6b97 Update sanitize_values.dm 2020-04-16 15:53:15 +02:00
Linzolle 39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie c774f18758 . 2020-04-14 19:18:08 +02:00
Ghommie 571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
GhomandGitHub 55402b1834 Merge branch 'master' into Ghommie-cit679 2020-04-14 16:22:00 +02:00
GhomandGitHub a57828703e Update mobs.dm 2020-04-14 16:09:31 +02:00
GhomandGitHub 5d01e05991 Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
kevinz000andGitHub 7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
2020-04-14 01:35:46 -07:00
Artur 356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghommie e753c1ad14 Fixed a little peeve with random bodies. 2020-04-14 02:20:19 +02:00
Ghommie db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie 0816512150 more work. 2020-04-13 16:09:52 +02:00
kevinz000andGitHub e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
2020-04-12 17:03:11 -07:00
kevinz000andGitHub 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
LinandGitHub 4e1079bc9a Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1
I did a oopsie and made containment bags also stop radiation internal to a contained object.
2020-04-12 16:20:08 +00:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
Ghommie 983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
AkrillaandGitHub 753be141be show pref change (#11793) 2020-04-09 20:32:50 +02:00
Putnam3145andGitHub 5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +02:00
GhomandGitHub 98312ec2c8 Update radiation.dm 2020-04-09 14:21:15 +02:00
GhomandGitHub 3433205130 Makes radioactive atoms actually still radiate other atoms within itself even if contained. 2020-04-09 13:56:19 +02:00
kevinz000andGitHub aee2f46b8d Merge pull request #11777 from Ghommie/Ghommie-cit670
Makes RAD_PROTECT_CONTENTS radiation flag protect both ways.
2020-04-09 02:41:21 -07:00
kevinz000andGitHub ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
2020-04-09 02:40:25 -07:00
Ghommie fb22a04939 Makes RAD_PROTECT_CONTENTS protect both ways. 2020-04-08 06:00:21 +02:00
LinandGitHub 8379169b81 Merge pull request #11476 from kevinz000/shield_refactor
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
Putnam d43e8052ad More threat swinging 2020-04-06 08:49:19 -07:00
kevinz000andGitHub 956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
Ghommie 9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
Artur 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur 4de14fbdf7 Finnishing touches 2020-04-01 12:59:06 +03:00
Artur f40f07b033 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
kevinz000andGitHub 37625adb69 Merge pull request #11698 from Ghommie/Ghommie-cit656
The banishment of the floating disembodied phallus.
2020-03-31 18:04:28 -07:00