39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
49e36e47ff
Merge pull request #11809 from kevinz000/storage_rework
...
Adds baystation-style volumetric space storage support
2020-04-14 13:17:11 +02:00
5d01e05991
Merge pull request #11618 from Arturlang/Garlic
...
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
7861b044ea
Merge pull request #11826 from Ghommie/Ghommie-cit675
...
Body size preferences! Oh no!
2020-04-14 01:35:46 -07:00
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
616d482cf6
Deleting poly clothes copypasta.
2020-04-13 22:51:46 +02:00
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
6b6683846b
Merge pull request #11819 from Ghommie/Ghommie-cit672
...
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
8604297dcd
Merge pull request #11811 from Ghommie/Ghommie-cit671
...
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-12 17:01:50 -07:00
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
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
fc58a34248
Merge pull request #11823 from Putnam3145/contam-buff
...
Bringing contamination back
2020-04-12 06:29:40 +02:00
fe4b270568
Sprite size preferences?! Oh no!
2020-04-12 05:08:49 +02:00
c8ebc6411e
Actually let's make it... differenter.
2020-04-11 12:58:43 -07:00
b5a150911c
Massively buffs contamination numbers
2020-04-11 12:43:14 -07:00
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
af55880794
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-10 17:22:34 +02:00
b40fb55539
Fixes mesmerzie and makes it work better ( #11785 )
...
* Weh
* Mesmerize works a lot nicer now
2020-04-10 15:41:35 +02:00
d19dd8f2e1
fixes baystruments ( #11790 )
...
* fix
* sigh
2020-04-10 15:36:42 +02:00
bc16600070
alternative way
2020-04-10 04:00:59 -07:00
165379c0b8
storage
2020-04-10 02:19:19 -07:00
e2440034f5
matrices..
2020-04-10 01:07:53 -07:00
9b13f009fe
k
2020-04-09 23:12:37 -07:00
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
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
956a85ab34
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
...
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
5c53314ee3
cancel
2020-04-08 00:57:09 -07:00
7ec669ecd4
bet
2020-04-07 16:11:58 -07:00
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
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
0d0ee1cd46
Merge remote-tracking branch 'citadel/master' into storage_rework
2020-04-06 18:40:58 -07:00
154e145e25
storage
2020-04-06 18:40:20 -07:00
d43e8052ad
More threat swinging
2020-04-06 08:49:19 -07:00
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
...
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
8af29a178c
Hooks up the chaplain null rod gloves to the choice of gloves
2020-04-04 16:42:37 +11:00
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +02:00
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
37625adb69
Merge pull request #11698 from Ghommie/Ghommie-cit656
...
The banishment of the floating disembodied phallus.
2020-03-31 18:04:28 -07:00
658701bf37
Various ghost role QoL; moving holding facility; removing energy net ( #11676 )
...
* Removed gay baby jail net from ninja
* Made a proper holding facility for syndicate contractors
* Made ghost role eligibility able to allow reghosting.
* Added a medibot to the holding facility.
* Added new comsigs to every other ghost proc
* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
a903752ff9
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-31 19:42:35 +03:00
e26b43d80b
The banishment of the floating disembodied phallus.
2020-03-31 02:40:28 +02:00
Linzolle