Commit Graph

46956 Commits

Author SHA1 Message Date
CitadelStationBot
9fb0fb22eb Automatic changelog generation for PR #15828 [ci skip] 2022-08-30 16:20:43 -05:00
Lin
578eed1875 Merge pull request #15828 from Putnam3145/anomaly-important
Made some events still show messages with intern
2022-08-30 21:20:39 +00: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
Changelogs
4fe27a2c9a Automatic changelog compile [ci skip] 2022-08-30 01:02:27 +00:00
Putnam3145
0a31d4cf12 Made some events still show messages with intern 2022-08-29 03:06:21 -07:00
CitadelStationBot
cea3c6b7ad Automatic changelog generation for PR #15820 [ci skip] 2022-08-29 01:16:08 -05:00
Lin
d0eb6db397 Merge pull request #15820 from Putnam3145/shoe-untieing
Nerf untied shoes event
2022-08-29 06:16:06 +00:00
CitadelStationBot
ac374bb71b Automatic changelog generation for PR #15823 [ci skip] 2022-08-29 01:15:59 -05: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
CitadelStationBot
6fa9de5dcf Automatic changelog generation for PR #15821 [ci skip] 2022-08-29 01:14:45 -05:00
Lin
31171aa2a6 Merge pull request #15821 from Putnam3145/better-climax-logging
Better climax logging
2022-08-29 06:14:42 +00: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
Changelogs
abc2fcd10e Automatic changelog compile [ci skip] 2022-08-27 00:51:05 +00:00
CitadelStationBot
e1ff29dc0d Automatic changelog generation for PR #15806 [ci skip] 2022-08-26 12:18:17 -05: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
CitadelStationBot
ed6f2a65ab Automatic changelog generation for PR #15812 [ci skip] 2022-08-26 12:17:49 -05:00
silicons
0ee8a0e1c3 Merge pull request #15812 from zeroisthebiggay/lacable
unbaconifies the recharge cable courtesy of ship test
2022-08-26 10:17:45 -07:00
shellspeed1
288320029a adds a sink to the kitchen 2022-08-25 22:30:36 -07:00
shellspeed1
aa107bdce1 tweaks based on testing and feedback. 2022-08-24 22:32:17 -07:00
Changelogs
0dd59b8a8a Automatic changelog compile [ci skip] 2022-08-25 01:01:16 +00:00
CitadelStationBot
08086f0f6f Automatic changelog generation for PR #15814 [ci skip] 2022-08-24 18:27:39 -05:00
Lin
6ed5718405 Merge pull request #15814 from Putnam3145/empty-find-lint
Add a grep for empty Find() calls
2022-08-24 23:27:37 +00:00
shellspeed1
cade664a0c removed insulated gloves and electric toolbox as they are no longer needed 2022-08-24 16:08:41 -07:00
shellspeed1
bbffaa61df removed access restriction on hydroponics locker 2022-08-24 15:49:05 -07:00
shellspeed1
e628f17e7a minor tweak to penthouse bathroom mirror 2022-08-24 15:28:51 -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
shellspeed1
2f82dfed9d fixes missing windoor 2022-08-24 15:13:01 -07:00
shellspeed1
3888cf602e removed duplicate stack of coal from garden pod 2022-08-24 15:12:27 -07:00
Changelogs
5161e2bd1b Automatic changelog compile [ci skip] 2022-08-24 00:54:50 +00:00
Putnam3145
b0f1755315 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into empty-find-lint 2022-08-23 14:47:03 -07:00
CitadelStationBot
b467edd94a Automatic changelog generation for PR #15809 [ci skip] 2022-08-23 13:25:43 -05: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
Changelogs
3664c57fdf Automatic changelog compile [ci skip] 2022-08-23 01:01:59 +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
CitadelStationBot
e1354c8553 Automatic changelog generation for PR #15813 [ci skip] 2022-08-22 19:13:29 -05:00
Lin
c0b953efb0 Merge pull request #15813 from Putnam3145/sec-level-woes
fixes security levels
2022-08-23 00:13:26 +00:00
CitadelStationBot
61dc45f268 Automatic changelog generation for PR #15805 [ci skip] 2022-08-22 19:13:01 -05:00
Lin
bdcdd411d7 Merge pull request #15805 from TrojanCoyote/augh-fix-platecarrier-sprite-ree
Fixes the plate carrier sprite
2022-08-23 00:12:58 +00:00
Putnam3145
49aa9f5845 Add a grep for empty Finds 2022-08-22 16:49:44 -07:00
Putnam3145
656ca9950b fixes security levels 2022-08-22 16:38:54 -07:00
zerothebigboy
8b9eac025a lacable 2022-08-22 03:00:32 -04:00
shellspeed1
3afb008bd6 fixes loose variable 2022-08-21 23:19:38 -07:00
shellspeed1
98658fe14a a 2022-08-21 23:18:02 -07:00
shellspeed1
4de90f71d8 forgot to add this. 2022-08-21 23:10:31 -07:00