Commit Graph

24192 Commits

Author SHA1 Message Date
Hatterhat
bc0ca30647 there is no cooldown, press G 2020-08-16 15:45:11 -05:00
Hatterhat
d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
Hatterhat
f4f8812318 whitespace (tm) 2020-08-10 11:30:36 -05:00
Hatterhat
4610908b8e Merge branch 'master' into parries-but-dumber 2020-08-10 11:29:27 -05:00
silicons
05290c85f3 Merge pull request #13094 from Hatterhat/tc-theft-patch
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00
silicons
ef2c024fbe Merge pull request #13093 from kappa-sama/patch-41
Tracer's a human, not a changeling.
2020-08-10 02:29:58 -07:00
silicons
3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
Hatterhat
301adc6769 ung 2020-08-09 23:58:12 -05:00
silicons
4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00
Winter Flare
76293ee032 My balls are raw. Meatballs, that is. (#13075)
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm

* Update apc.dm

* Update apc.dm
2020-08-09 15:57:53 +02:00
silicons
5abab38613 increases space levels to 4 (#13022)
* Update map_config.dm

* Update code/modules/mapping/map_config.dm

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2020-08-09 15:41:58 +02:00
Seris02
635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
silicons
a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
ed07497835 Merge pull request #13040 from Sishen1542/blockstool
funny chair loses block chance and gains active block/parry
2020-08-09 05:44:13 -07:00
silicons
8ef539b417 Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
2020-08-09 05:43:37 -07:00
silicons
fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
silicons
cd18e3f4d3 Merge pull request #13085 from Hatterhat/glaive-parry-cont
KC-G Phase 2.1 - Parry Tweaks
2020-08-09 05:41:26 -07:00
silicons
d2f5c6688b Merge pull request #13084 from Putnam3145/ic-wording-fix
Made IC issue wording less salt-assuming
2020-08-09 05:41:10 -07:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
Letter N
773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
silicons
ba6eefc945 Merge pull request #13078 from Putnam3145/fix-reroll
Made traitor reroll reroll to MI13 only.
2020-08-09 05:38:23 -07:00
silicons
bd65c8efc6 Merge pull request #13079 from Hatterhat/parry-text
parry counterattack text now actually shows up
2020-08-09 05:37:42 -07:00
silicons
d9764bf5ea Merge pull request #13066 from timothyteakettle/make-speech-verbs-dna-based
speech verbs now copy through dna copying
2020-08-09 05:37:08 -07:00
silicons
88cb61b08a Merge pull request #13068 from Hatterhat/med-stack-buff
sterilized gauze, ointment and suture stacksizes
2020-08-09 05:36:51 -07:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
zerothebigboy
822c17e444 a 2020-08-09 08:07:40 -04:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Letter N
2615506ae9 oops, forgot about this 2020-08-09 13:18:10 +08:00
Hatterhat
197e426432 heho funny uplink thefties 2020-08-08 23:54:31 -05:00
Letter N
4bed3a5349 OH FUCK 2020-08-09 12:49:14 +08:00
Putnam
bdee7bdc63 linters are always your friend 2020-08-08 21:38:53 -07:00
Letter N
5abcc1c220 reverts this change 2020-08-09 12:00:12 +08:00
kappa-sama
8c61dd875b poggers 2020-08-08 21:30:42 -04:00
Lin
f545434f65 Merge pull request #13072 from silicons/fancy_floor
fixes runtimes from people screwdrivering wooden floors
2020-08-08 20:02:55 -05:00
Hatterhat
a496588171 bokken cooldown nerf but slightly 2020-08-08 14:31:45 -05:00
Hatterhat
c7e850ae19 longparry stagger reduced, cooldown made universal 2020-08-08 14:14:47 -05:00
Hatterhat
98d305e5f6 bokken nerfs, desword deflects 2020-08-08 14:11:47 -05:00
Hatterhat
e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Lin
dea2dab536 Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
Lin
13d94717f4 Merge pull request #13052 from Citadel-Station-13/silicons-patch-76
fixes laptops not being able to be picked up
2020-08-08 12:05:36 -05:00
Lin
f154623284 Merge pull request #13059 from Citadel-Station-13/silicons-patch-81
immovable rods no longer drop down chasms
2020-08-08 12:02:47 -05:00
Lin
f13b0df7fe Merge pull request #13057 from Citadel-Station-13/silicons-patch-79
Fixes telekinesis being able to be used to wield objects
2020-08-08 12:02:10 -05:00
Hatterhat
9a862b10e1 the perfect parry update 2020-08-08 10:47:43 -05:00
Letter N
e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Putnam
02c990ab27 Toggle's no longer relevant. 2020-08-08 02:18:58 -07:00
Putnam
9dcfceb8e9 Made IC issue wording less assuming-salt 2020-08-08 01:32:18 -07:00