Commit Graph

2467 Commits

Author SHA1 Message Date
rosko
cc8423ac45 adds a lizzard plushie
yet another player plushie....this one comes with a real fake maxcap
2019-11-05 20:38:44 +02:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Ghommie
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
TrilbySpaceClone
526d9b203c aliens
man
2019-11-04 00:34:03 -05:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
Trilbyspaceclone
9af899c9c3 cleaning up 2019-11-03 12:59:41 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
kevinz000
6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291
Fixing dogborg sleepers runtimes, how atrocious...
2019-11-03 06:20:30 -07:00
kevinz000
3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-11-03 06:14:13 -07:00
kevinz000
dcee360ac5 Merge pull request #9686 from Ghommie/Ghommie-cit304
Fixing storage implant transplant.
2019-11-03 06:11:20 -07:00
Poojawa
d8e0771dcd Better Health Analyzer formatting
Because having it all bunched up is a pet peeve.
2019-11-02 23:14:39 -05:00
Ghommie
7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. 2019-11-03 04:23:31 +01:00
Ghommie
0cce37cedb How many times I have encountered theis sort of issues in the past and how much of a meme it was... 2019-11-02 20:18:40 +01:00
Ghommie
065fbdf0cb Fixing gibspawner runtimes, how gruesome... 2019-11-02 19:37:35 +01:00
Ghommie
91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie
874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
Ghommie
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
kevinz000
be752c1fb0 Merge pull request #9531 from Ghommie/Ghommie-cit246
Little stunbaton nerf (split off from #9500)
2019-10-29 21:43:45 -07:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
a7039c2d89 Merge pull request #9500 from Ghommie/Ghommie-cit237
teleprods works on non-carbons too now.
2019-10-29 21:37:41 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
2019-10-29 21:29:12 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262
Porting movespeed modification system updates.
2019-10-29 21:27:53 -07:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2019-10-29 21:26:03 -07:00
kevinz000
2ca3cedaed Merge pull request #9648 from Ghommie/Ghommie-cit288
Random plush spawner tweaks and fixes.
2019-10-29 21:22:46 -07:00
kevinz000
0fb5687a0a Update RCD.dm 2019-10-29 16:53:15 -07:00
kevinz000
0746d782d7 Update RCD.dm 2019-10-29 16:43:59 -07:00
kevinz000
39030b8fb0 Update RCD.dm 2019-10-29 16:37:36 -07:00
Ghommie
6a64647ee8 Fixing dogborg sleepers runtimes, how atrocious... 2019-10-29 19:45:10 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
kevinz000
d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000
dabfba8a0d Merge pull request #9619 from BlackMajor/Yote
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
TrilbySpaceClone
63cb466360 MK II 2019-10-26 18:59:34 -04:00
BlackMajor
1b2d1c1423 Whoops again 2019-10-27 02:04:46 +13:00
BlackMajor
90d28b7202 whoops 2019-10-26 23:00:12 +13:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
kevinz000
49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
2019-10-25 20:12:35 -07:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie
c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
Ghommie
a62fcdcccb forgot about the file extension. 2019-10-25 03:34:13 +02:00