necromanceranne
c5b55826b5
Punches land with the same consistency across races, punches cheaper, king hits are nastier ( #11707 )
...
* I think everyone should be landing punches now.
* brawling just got mathematical?
* pawnch harder get tired less this is a balance change now I guess
* nearly added instastun king hits, now stun punches are more rng
* I'm tired okay
2020-04-03 14:19:40 +02:00
Putnam
3365466db7
Couplea fixes to the previous tweak
2020-04-03 02:25:16 -07:00
Putnam
d398c5276c
Also made all these "else ifs" into a "switch"
2020-04-03 01:59:48 -07:00
Putnam
492546c05c
Pacifist digestion checks are elsewhere anyway
2020-04-03 01:53:35 -07:00
necromanceranne
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
Artur
7da4ad5694
Damned title doesnt want to show up
2020-04-03 10:29:07 +03:00
Ghom
37b6aa9897
Update dwarves.dm
2020-04-03 05:31:37 +02:00
Ghommie
4ef42ba6b1
Dwarfy message spam QoL.
2020-04-03 05:16:17 +02:00
necromanceranne
b37dc1e322
Merge branch 'punch' into pawnch_2_the_pawnchening
2020-04-03 14:02:42 +11:00
necromanceranne
e1a013bcb2
I'm tired okay
2020-04-03 11:30:00 +11:00
necromanceranne
c481db2bfd
nearly added instastun king hits, now stun punches are more rng
2020-04-03 11:25:29 +11:00
necromanceranne
f26a9b948c
pawnch harder get tired less this is a balance change now I guess
2020-04-03 10:50:26 +11:00
Ghommie
1c81c8676b
Stops alopecia.
2020-04-03 00:33:38 +02:00
Ghommie
5a63eba57a
Stops a monky trick with mob holders.
2020-04-03 00:23:58 +02:00
Ghommie
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
Timothy Teakettle
6b3de998c0
remove noreact from being used in plants
2020-04-02 21:18:27 +01:00
Timothy Teakettle
0dcc630c4a
ports some trait changes
2020-04-02 21:15:04 +01:00
Putnam3145
ede3379a87
Merge pull request #11719 from Ghommie/Ghommie-cit662
...
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
Ghommie
e50fe8b061
Removing a trademark from the game.
2020-04-02 14:48:43 +02:00
kiwedespars
9b6cd54abf
there's an extra space and it bugged me im sorry
2020-04-02 00:35:38 -07:00
kiwedespars
eeccea989c
purple nerf - light pink gets epi back
2020-04-02 00:34:44 -07:00
kiwedespars
d9e8db8a6c
Update _status_effects.dm
2020-04-01 23:31:51 -07:00
Putnam3145
736ef2cb7c
Merge pull request #11705 from Ghommie/Ghommie-cit659
...
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
kevinz000
baf5150c51
fixes two runtimes
2020-04-01 22:35:26 -07:00
Putnam3145
a9bfe00302
Merge pull request #11701 from Ghommie/Ghommie-cit657
...
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
Ghommie
519ebd5ed8
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-01 15:29:35 +02:00
Artur
881f8765f4
Stufffs
2020-04-01 15:29:40 +03:00
necromanceranne
13c474f2af
brawling just got mathematical?
2020-04-01 22:05:22 +11: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
kevinz000
82c8710267
Merge pull request #11700 from kiwedespars/papermask
...
adds new cosmetic and craftable paper masks.
2020-04-01 01:03:14 -07:00
necromanceranne
157ef93c0b
I think everyone should be landing punches now.
2020-04-01 15:12:59 +11:00
Ghommie
73c52c0c6e
Accurate minefield.
2020-04-01 05:19:29 +02:00
Ghommie
04c8cb09a4
out of bounds coordinates sanity
2020-04-01 04:41:21 +02:00
Ghommie
736760ac06
Minesweeper oopsies etcetera.
2020-04-01 04:39:36 +02:00
kevinz000
37625adb69
Merge pull request #11698 from Ghommie/Ghommie-cit656
...
The banishment of the floating disembodied phallus.
2020-03-31 18:04:28 -07:00
kevinz000
d2709af670
Merge pull request #11693 from Trilbyspaceclone/patch-327
...
Corrects OPS crate
2020-03-31 18:04:03 -07:00
kevinz000
a2372bb213
Merge pull request #11692 from Seris02/AAAAAAAAAAA
...
small improvement with color selections on character appearance menu
2020-03-31 18:03:49 -07:00
kevinz000
3fdb681ff5
Merge pull request #11685 from Ghommie/Ghommie-ci654
...
Ports "I got high and made a thing that was broke and 3 years, 2 months, 17 days later I get high and fix it."
2020-03-31 18:03:28 -07:00
kevinz000
b5f1cbd3d0
Merge pull request #11683 from timothyteakettle/wrestling_holodeck
...
holodeck WRESTLING
2020-03-31 18:03:00 -07:00
kevinz000
6bbc2c0db8
Merge pull request #11682 from Putnam3145/fix-sabotage
...
Sabotage objective tweaks
2020-03-31 18:02:24 -07:00
kevinz000
b3642a3470
Merge pull request #11681 from PersianXerxes/medicalTGUINext
...
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
kevinz000
234dd9c439
Merge pull request #11669 from Ghommie/Ghommie-cit651
...
Ports "Fixes vault and high security door material exploit and tweaks high security door cost"
2020-03-31 18:00:02 -07:00
Ghom
5f128447f5
Update guardian.dm
2020-04-01 02:21:50 +02:00
Ghommie
5bae25c889
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit659
2020-04-01 00:49:13 +02:00
Ghommie
8bb98f92ca
It's past midnight, time for your runtimes flattening.
2020-04-01 00:47:29 +02:00
Kraseo
a8759b048e
smashes the tyranny of public mining
2020-03-31 23:32:15 +02:00
Putnam3145
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
Artur
4d53c3f6c0
updates vendors..
2020-03-31 21:00:50 +03:00
