Commit Graph
4809 Commits
Author SHA1 Message Date
TrilbyspacecloneandGitHub 9badda96d8 huh 2019-05-31 18:04:02 -04:00
TrilbyspacecloneandGitHub 5e67974611 old file fixing 2019-05-31 18:01:22 -04:00
TrilbyspacecloneandGitHub aaaebe625b old file fixes 2019-05-31 18:00:00 -04:00
TrilbyspacecloneandGitHub 3891cf1ff6 Update sheet_types.dm 2019-05-31 17:54:49 -04:00
TrilbyspacecloneandGitHub 96a32f7c3d Update boxes.dm 2019-05-31 17:53:54 -04:00
BlackMajor 46123cb1fa First attempt at making size change damage (doesn't work yet) 2019-06-01 02:45:14 +12:00
BlackMajor 2b1931c217 Compression kit can now shrink dicks. Also gives it way more feedback. 2019-06-01 00:42:40 +12:00
BurgerLua 5f94441cc7 Adds Clockwork Reflectors 2019-05-30 22:52:43 -07:00
TrilbyspacecloneandGitHub 5d80fb6811 Update backpack.dm 2019-05-30 15:04:45 -04:00
a6e85a63ba Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
2019-05-30 11:14:31 -04:00
BlackMajor 0d06605662 Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
2019-05-30 16:17:33 +12:00
BlackMajor 4cfb473e3a Update
Fixes merge conflict with gangs.
Adds a little feedback.
Fixes crystal eating.
2019-05-30 12:23:57 +12:00
TrilbyspacecloneandGitHub 027ee1e596 Update plushes.dm 2019-05-29 16:40:41 -04:00
BlackMajor 93464b8f24 Adds bluespace compression kit 2019-05-30 02:46:34 +12:00
Ghommie 8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Ghommie bcf1072399 fixes eyestabbing, better this time. 2019-05-29 10:08:00 +02:00
kevinz000 8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
TrilbyspacecloneandGitHub 7a17ca381b tweaks 2019-05-27 21:58:09 -04:00
kevinz000andGitHub e8036a8a9b Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
2019-05-27 14:08:52 -07:00
JTGSZ 93813613aa Some changes. 2019-05-27 14:42:07 -04:00
Poojawa 333964fe02 Fixes atmos and station alert consoles not updating visually 2019-05-27 06:33:30 -05:00
kevinz000andGitHub e0a0be9e4e Merge pull request #8440 from BurgerLUA/Sensor-Improvement
Improves Crew Monitoring Console Sorting
2019-05-27 03:30:39 -07:00
TrilbyspacecloneandGitHub 6633ff4533 grammar 2019-05-27 04:47:56 -04:00
TrilbyspacecloneandGitHub f2ee85371d Update shields.dm 2019-05-27 04:40:47 -04:00
Ghommie 37aa491fa5 removes emp downtime, Kev's request. 2019-05-27 02:30:03 +02:00
dtfe3andGitHub f56960ff88 Fract said max 35 2019-05-27 00:39:48 +02:00
dtfe3andGitHub 38a6c1f917 Decreased the increase from 45 to 40 2019-05-27 00:22:50 +02:00
dtfe3andGitHub 745df721ba CWC player requirement increase
Player requirement increase from 30 to 45

well basically most people dislike CWC in lowpop and it's generally unbalanced during lowpop so let's just not have it happen during lowpop. Easy fix!
2019-05-26 23:20:27 +02:00
7e10b4bed9 Update code/game/objects/items/stunbaton.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-26 22:03:38 +02:00
BurgerLua e3aaff68b7 Added 2019-05-26 00:34:37 -07:00
Ghommie a47a7b31ba more leniency. 2019-05-26 06:56:02 +02:00
Ghommie cfa53d53f1 updating old teleprods. 2019-05-26 06:49:58 +02:00
Ghommie 288f97dd13 further tweaking. 2019-05-26 06:38:04 +02:00
Ghommie 7289d8a999 tweaking. 2019-05-26 06:31:25 +02:00
Ghommie 9b2ab8fc2a 21 minutes sounds, I don't really wanna overly punish. 2019-05-26 05:21:17 +02:00
Ghommie e61942cba9 it will approx take 18-19 minutes now. 2019-05-26 05:18:07 +02:00
Ghommie 28c435134b stunbaton emp & status tweaks 2019-05-26 04:52:05 +02:00
GhomandGitHub b2eea5e3f4 Sorry, web edit because I didn't commit the ?. 2019-05-26 04:11:52 +02:00
Ghommie 2fe1431db6 Applying suggestion, ?. so no theorical runtime. 2019-05-26 03:40:48 +02:00
TrilbyspacecloneandGitHub 070e43ca64 Update sheet_types.dm 2019-05-25 17:58:33 -04:00
TrilbyspacecloneandGitHub b6590cd9e9 Update boxes.dm 2019-05-25 17:54:57 -04:00
TrilbyspacecloneandGitHub ed974bdcde Update sheet_types.dm 2019-05-25 17:18:40 -04:00
TrilbyspacecloneandGitHub a2f825d45b Merge branch 'master' into patch-135 2019-05-25 16:12:37 -04:00
TrilbyspacecloneandGitHub 12994f7a59 Update jetpack.dm 2019-05-25 16:11:33 -04:00
TrilbyspacecloneandGitHub 915e41e5e6 Update jetpack.dm 2019-05-25 16:08:19 -04:00
deathride58andGitHub 4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
kevinz000andGitHub 90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
kevinz000andGitHub d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000andGitHub e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
Ghommie 521c371253 actually, let's just halve it, won't be an issue I suppose. 2019-05-25 07:44:45 +02:00