Commit Graph
29264 Commits
Author SHA1 Message Date
YakumoChenandGitHub 77f6074c67 adds rings to loadout 2020-01-31 08:56:20 -05:00
YakumoChenandGitHub c489571d69 Update ring.dm 2020-01-31 13:55:06 +00:00
YakumoChenandGitHub 32f3b31127 adds two crates 2020-01-31 08:54:07 -05:00
YakumoChenandGitHub 89134d8b30 updates fancy
the boxes actually work now
2020-01-31 08:52:45 -05:00
YakumoChenandGitHub acb6bb63f6 Delete ring.dmi 2020-01-31 13:51:30 +00:00
YakumoChenandGitHub 7b1af64a31 update ring.dmi 2020-01-31 08:50:55 -05:00
YakumoChenandGitHub 1ed4b90e5f update fancy 2020-01-31 07:14:58 -05:00
YakumoChenandGitHub 922f91b409 adds ring.dm to gloves 2020-01-31 06:34:29 -05:00
YakumoChenandGitHub 065691ca1e adds ring boxes to fancy 2020-01-31 06:33:13 -05:00
YakumoChenandGitHub feac28a5f7 ring.dmi 2020-01-31 06:31:59 -05:00
YakumoChenandGitHub c77d36905b Merge pull request #18 from Citadel-Station-13/master
update i hope
2020-01-30 22:39:20 -05:00
CitadelStationBot 21b8f0515d Automatic changelog generation for PR #10768 [ci skip] 2020-01-30 15:46:43 -06:00
LinandGitHub 2b47d868ad Merge pull request #10768 from kevinz000/quick_thing
moths can now chitter, and their laughs are now "unique"
2020-01-30 21:46:41 +00:00
CitadelStationBot bb4016f13a Automatic changelog generation for PR #10644 [ci skip] 2020-01-30 14:30:58 -06:00
GhomandGitHub 15e5f0ef5d Merge pull request #10644 from ShadeAware/master
Craftable Switchblades: The Finale
2020-01-30 21:30:55 +01:00
CitadelStationBot 55a0e4e55d Automatic changelog generation for PR #9860 [ci skip] 2020-01-29 21:15:26 -06:00
kevinz000andGitHub e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2020-01-29 20:15:22 -07:00
GhomandGitHub 1caa2af4cf Update weaponry.dm 2020-01-30 04:05:35 +01:00
CitadelStationBot 0316a15142 Automatic changelog generation for PR #10746 [ci skip] 2020-01-29 21:01:19 -06:00
GhomandGitHub c96267eb06 Merge pull request #10746 from Citadel-Station-13/kevinz000-patch-9
CAPTURE THE FLAG NOW HAS CLAYMORES
2020-01-30 04:01:17 +01:00
GhomandGitHub 96e6e5903d Merge pull request #10783 from r4d6/fix
AAAAAAH
2020-01-30 04:00:07 +01:00
r4d6 cd048ebd77 AAAAAAH 2020-01-29 21:50:55 -05:00
GhomandGitHub 793cc26ddc Update weaponry.dm 2020-01-30 03:28:47 +01:00
GhomandGitHub 096d9e01e1 Update weaponry.dm 2020-01-30 03:19:04 +01:00
GhomandGitHub b2ca380a13 Update weaponry.dm 2020-01-30 03:15:24 +01:00
kevinz000andGitHub 0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf
Removes stim packs from gangs
2020-01-29 16:24:51 -07:00
CitadelStationBot c1b60db699 Automatic changelog generation for PR #10749 [ci skip] 2020-01-29 17:19:40 -06:00
GhomandGitHub f74475a6e0 Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
2020-01-30 00:19:37 +01:00
CitadelStationBot 27019974f8 Automatic changelog generation for PR #10773 [ci skip] 2020-01-29 16:51:04 -06:00
kevinz000andGitHub cff69db1c3 Merge pull request #10773 from Putnam3145/whoops-gaseous
Fixes to hypno toggle
2020-01-29 15:51:01 -07:00
kevinz000andGitHub e3a3c8f241 woops 2020-01-29 15:45:57 -07:00
LinandGitHub cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
2020-01-29 19:58:26 +00:00
LinandGitHub 15f36fab60 Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet
Adds cosmic bedsheet to loadout for donator
2020-01-29 19:43:01 +00:00
LinandGitHub 293e6576c8 Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
2020-01-29 19:25:13 +00:00
GhomandGitHub 319973f2eb Merge pull request #10775 from r4d6/fix
Fix HE Manifold Sprites, for good. [Speedmerge please]
2020-01-29 19:01:57 +01:00
r4d6 c57dedd808 fix 2020-01-29 12:30:05 -05:00
Putnam 7626750c49 hypno tweaks 2020-01-28 23:03:29 -08:00
CitadelStationBot 6553aa634f Automatic changelog generation for PR #10295 [ci skip] 2020-01-28 22:34:52 -06:00
GhomandGitHub 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
2020-01-29 05:34:49 +01:00
CitadelStationBot cbd1fd2a67 Automatic changelog generation for PR #10761 [ci skip] 2020-01-28 22:31:21 -06:00
GhomandGitHub dca1d8bcd3 Merge pull request #10761 from Putnam3145/fix-forced-gender
Makes gender change potion not work on people with pref
2020-01-29 05:31:18 +01:00
CitadelStationBot 31f24b8600 Automatic changelog generation for PR #10728 [ci skip] 2020-01-28 20:46:34 -06:00
GhomandGitHub bf97c2da3e Merge pull request #10728 from kevinz000/hugbox_meteor_time
Meteor waves are now directional (and tell you the direction on the ""1 minute""+ warning)
2020-01-29 03:46:32 +01:00
GhomandGitHub 44c141f009 Merge branch 'master' into hugbox_meteor_time 2020-01-29 02:28:12 +01:00
CitadelStationBot 754fb126f5 Automatic changelog generation for PR #10751 [ci skip] 2020-01-28 19:16:41 -06:00
GhomandGitHub 3671f58612 Merge pull request #10751 from Citadel-Station-13/kevinz000-patch-14-1
traitor+bro now have a minimum population of 25
2020-01-29 02:16:38 +01:00
CitadelStationBot 987e0e16e2 Automatic changelog generation for PR #10748 [ci skip] 2020-01-28 18:59:45 -06:00
GhomandGitHub 2643fd053b Merge pull request #10748 from Trilbyspaceclone/door-
correct door to vault being all access
2020-01-29 01:59:42 +01:00
GhomandGitHub cf3466252e Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
[s] more reasonable reagent logging
2020-01-29 01:59:09 +01:00
kevinz000andGitHub d3343a1e26 Merge pull request #10697 from Citadel-Station-13/Ghommie-patch-2
Makes transfer_ckey() less pedant.
2020-01-28 17:59:00 -07:00