Commit Graph

30258 Commits

Author SHA1 Message Date
shellspeed1
bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1
1130a9341e now it actually works 2022-09-09 20:02:45 -07:00
shellspeed1
f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
Putnam3145
617768dd40 Destructive analyzer no longer buy one get 49 free 2022-09-02 15:09:15 -07:00
Lin
c35246d87b Merge pull request #15827 from Putnam3145/singunerf
Field generators now yell on the radio if they fail while there's a singulo/tesla
2022-09-01 05:34:36 +00:00
Lin
5676dd6424 Merge pull request #15830 from Putnam3145/sleep-tight-disky
comfier disks take longer to summon lone ops (they still will though)
2022-09-01 05:34:22 +00:00
zeroisthebiggay
7aeec9b083 replaces weight machine sprites with TG's and subsequently wipes a portion of the goon file's existence (#15829)
* basedado

* becnhpress
2022-08-31 21:38:44 -07:00
silicons
34caa8c75f Merge pull request #15808 from Putnam3145/rep-investment
Allows setting antags to "low" (if antag rep is on)
2022-08-31 15:09:27 -07:00
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
c5d1a5f590 sleep tight, disky 2022-08-29 21:35:54 -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
74a06748b3 need to qdel the radio 2022-08-28 16:08:41 -07:00
Putnam3145
1a20c527ed field generators now yell if they fail 2022-08-28 15:40:03 -07: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
78df2c1312 Merge pull request #15803 from Citadel-Station-13/silicons-patch-13
fixes "silent" quirks with no gain/lose text spamming runtimes
2022-08-23 18:24:57 +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
Putnam3145
656ca9950b fixes security levels 2022-08-22 16:38:54 -07: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
Putnam3145
139bcaa1b5 whoops forgot a bit of migration 2022-08-21 16:47:39 -07:00
Putnam3145
3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07: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
ad289629a7 Update _quirk.dm 2022-08-20 12:30:32 -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