Commit Graph

20524 Commits

Author SHA1 Message Date
silicons
58d28db69f Merge pull request #15825 from Putnam3145/fix-job-code
Unfricks job code (oh well)
2022-08-31 15:07:08 -07:00
Putnam3145
0385d27b24 Revert "sleep tight, disky"
This reverts commit e27502ceb1.
2022-08-29 21:34:41 -07:00
Putnam3145
e27502ceb1 sleep tight, disky 2022-08-29 21:34:26 -07:00
Putnam3145
0a31d4cf12 Made some events still show messages with intern 2022-08-29 03:06:21 -07:00
Lin
d0eb6db397 Merge pull request #15820 from Putnam3145/shoe-untieing
Nerf untied shoes event
2022-08-29 06:16:06 +00:00
Lin
3bb576bea7 Merge pull request #15823 from zeroisthebiggay/paidforinsex
fixes harpy wings and steals the harpy wings from rp so that there is some variety
2022-08-29 06:15:57 +00:00
Putnam3145
6bb103e3dc unf***s job code (oh well) 2022-08-27 19:16:04 -07:00
zerothebigboy
434d7e0d10 don't lick a pai worst mistake i have ever made please fuck do not do it 2022-08-27 06:29:16 -04:00
Putnam3145
6bb3d81d00 Better climax logging 2022-08-26 19:05:03 -07:00
Putnam3145
babb333779 nerf untied shoes event 2022-08-26 18:56:30 -07:00
silicons
4a6358d2f4 Merge pull request #15806 from shellspeed1/new-mining-pods
Penthouse pod rework plus new garden pod.
2022-08-26 10:18:13 -07:00
shellspeed1
2e6ff742a9 minor change to map template description. 2022-08-24 15:15:36 -07:00
shellspeed1
d175b4d247 capitalization stuff 2022-08-24 15:13:19 -07:00
Lin
8564d7ce56 Merge pull request #15809 from zeroisthebiggay/fract
thighjob from a girl wearing a microskirt who can beat the shit out of you at any moment (hyper slutskirt/secukini sprites)
2022-08-23 18:25:40 +00:00
Lin
beb25901d6 Merge pull request #15810 from Citadel-Station-13/silicons-patch-15
Fixed shuttle runtime
2022-08-23 18:24:37 +00:00
Lin
fca2f71b7b Merge pull request #15804 from Citadel-Station-13/silicons-patch-14
fixes security officer mob init runtimes
2022-08-23 00:17:14 +00:00
silicons
f2b8061d4b Update observer.dm (#15802) 2022-08-21 20:39:17 -07:00
Lin
257d377192 this is really stupid (#15801) 2022-08-21 20:38:47 -07:00
silicons
9fbc2a47f0 Update shuttle.dm 2022-08-21 18:05:19 -07:00
zerothebigboy
4cd74e3b31 thighjob from a girl wearing a microskirt who can beat the shit out of you whenever 2022-08-21 20:55:37 -04:00
shellspeed1
f030d0038f New garden pod 2022-08-21 05:00:26 -07:00
silicons
27c404abd2 Update security_officer.dm 2022-08-21 03:13:47 -07:00
Lin
d40559c15d Merge pull request #15786 from zeroisthebiggay/booty
the sexy workout shorts
2022-08-21 01:08:36 +00:00
zerothebigboy
b0869fcc2c man am i blind 2022-08-20 16:43:39 -04:00
silicons
5a32c5ec40 Update security_officer.dm 2022-08-20 13:07:53 -07:00
silicons
b49c1c49e5 Update security_officer.dm 2022-08-20 12:32:37 -07:00
silicons
bfd3aadab1 Merge pull request #15773 from zeroisthebiggay/mining
mining drills scanners and crushers getting a TG inspired glow up
2022-08-20 12:27:20 -07:00
silicons
18b797d0f4 Merge pull request #15758 from LetterN/patch-12
fix pod not unlocking on code delta
2022-08-20 12:27:11 -07:00
silicons
d438103cf9 Merge pull request #15761 from Hatterhat/fatrolling
bloodborne (adds dodgeroll combat RMB to the cleaving saw, confers melee/projectile iframes)
2022-08-20 12:27:04 -07:00
silicons
1f5f6ce699 Merge pull request #15760 from Hatterhat/skill-issue
skill mod shuffle pr + implied complaining about why dont they reflect the actual skill xp levels themselves
2022-08-20 12:26:46 -07:00
silicons
98e0e1262f Merge pull request #15764 from Putnam3145/drying-agent-chem-gas
Space lube is now a chem gas (also some other stuff too)
2022-08-20 12:26:38 -07:00
silicons
5a0c62e332 Merge pull request #15767 from LetterN/patch-10
gateway vis
2022-08-20 12:26:02 -07:00
silicons
23586cb7fd Merge pull request #15768 from zeroisthebiggay/ninjagungo
ninja sprite refresh + very minor evening/midnight gloves consistency + removes a stray pixel from the mauler gauntlets
2022-08-20 12:25:25 -07:00
silicons
2865dc6416 Merge pull request #15779 from Linzolle/radial-surgery
radial menu surgery
2022-08-20 12:24:56 -07:00
silicons
4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay
the great medbay resprite PR: ported from a freshly merged TG PR
2022-08-20 12:24:46 -07:00
silicons
ec99cac940 Merge pull request #15799 from Putnam3145/makes-signal-commander-work
Makes signal commander work
2022-08-20 12:23:48 -07:00
silicons
ce138553fa Merge pull request #15800 from Putnam3145/fix-infinite-blood
Fix infinite blood trails
2022-08-20 12:23:38 -07:00
Lin
4b21981547 ooc colour shenanigans (#15788) 2022-08-20 01:41:20 -07:00
Lin
c8104ec155 Merge pull request #15797 from Putnam3145/sandstorm-nerf
sandstorm nerf
2022-08-19 21:12:26 +00:00
Putnam3145
9998ca7a10 another funny space cleaner gas buff 2022-08-18 23:54:01 -07:00
Putnam3145
12233bfbca Fix infinite blood trails 2022-08-18 23:36:24 -07:00
Putnam3145
5b221dc354 Makes signal commander work 2022-08-18 23:01:47 -07:00
Lin
f18d40f3a7 Merge pull request #15794 from zeroisthebiggay/patch-29
cauteries searing tools and energy scalpels now have heat and can be used to light cigarettes
2022-08-19 05:55:00 +00:00
Putnam3145
81cbda5cda announcement too 2022-08-18 01:15:34 -07:00
Putnam3145
6847ef3db5 sandstorm nerf 2022-08-18 01:13:05 -07:00
Putnam3145
228c637d76 Probably fixes bad stake behavior 2022-08-17 19:19:50 -07:00
zeroisthebiggay
a600ea86b9 midround pr get trolled 2022-08-17 00:59:07 -04:00
Putnam3145
d565d6a097 makes chem gases fully condense if below threshold 2022-08-16 00:50:47 -07:00
Putnam3145
c8a84c2172 forgot the ..() 2022-08-15 23:42:42 -07:00
zerothebigboy
44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00