kevinz000
34fbcd1dc0
fixes
2020-02-19 07:49:05 -07:00
kevinz000
4a537d770d
let's make this work
2020-02-19 07:20:16 -07:00
kevinz000
950082f537
k
2020-02-18 20:49:42 -07:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghom
08c86ec1ea
Merge pull request #11091 from BlueWildrose/master
...
Podpeople species tail wag fix; also lifebringer name fix
2020-02-18 17:11:50 +01:00
kevinz000
d04126226b
Merge pull request #11082 from Hatterhat/preservahyde
...
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
2020-02-18 02:21:37 -07:00
kevinz000
918618831c
Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3
...
Something about gibs and mob biotypes.
2020-02-18 02:17:32 -07:00
BlueWildrose
78fcd706b3
Requested changes, podpeople.dm
2020-02-17 19:41:30 -07:00
Lin
a37e1ab129
Merge pull request #11093 from Ghommie/Ghommie-cit580
...
Something about blood and species handle_chemicals()
2020-02-16 12:36:41 -06:00
kevinz000
379c914099
Merge pull request #10704 from Ghommie/Ghommie-cit529
...
More Runtimenator fixes.
2020-02-16 05:10:19 -07:00
Trilbyspaceclone
a8d45f8361
Update crab.dm ( #11105 )
2020-02-16 07:39:56 +01:00
Ghom
abf7d2423a
Update death.dm
2020-02-16 07:17:53 +01:00
TrilbySpaceClone
cba6667332
it could work
2020-02-15 18:42:50 -05:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000
ee9b38017e
Merge pull request #10995 from Ghommie/Ghommie-cit568
...
Something about cryopods.
2020-02-15 12:17:02 -07:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784
Merge pull request #10940 from Ghommie/Ghommie-cit560
...
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
kevinz000
6e2e7e29d1
Merge pull request #11072 from Ghommie/Ghommie-cit576
...
Doubled halved flavor text max length and removed crappy code.
2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6
Merge pull request #11073 from Ghommie/Ghommie-cit577
...
Reduced tongue organ damage and tasting pH message spam.
2020-02-15 11:45:50 -07:00
Ghom
8e3673480f
Merge pull request #11048 from Trilbyspaceclone/patch-283
...
Blood Drunk Miner now uses a PKA
2020-02-15 09:05:45 +01:00
Ghommie
4a621fb1aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
2020-02-14 19:39:53 +01:00
Ghom
1e57664a99
Merge pull request #10934 from kevinz000/actual_ghost_newscasters
...
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
2020-02-14 19:21:48 +01:00
Ghom
8934f9b401
Update flypeople.dm
2020-02-14 17:24:50 +01:00
Ghom
4512845fc3
Merge pull request #11062 from Citadel-Station-13/kevinz000-patch-10
...
Changes to organ decay rate (tip it's not 15 minutes 0-100 damage and this was lying to you)
2020-02-14 13:36:39 +01:00
Blue Wildrose
d45a20c19b
Podpeople tweaks
...
- Podpeople can wag tails now
- Moved a few features into the podperson race itself instead of its weaker, roundstart variant; this in theory, will allow pod-grown hydroponics podpeople to have hair now, as well as all those anthropomorphic features, should they be revived through this method.
- Fixed the lifebringers having no name somehow but... currently lifebringers under this change will turn them into animal anthropomorphic hairy mutants of some kind until I figure out how to make them the bald podpeople that they once were, could use some help with this.
2020-02-14 05:12:50 -07:00
Ghommie
0f5952fff7
Something about blood and species.
2020-02-14 09:48:10 +01:00
Ghom
9e222e37c0
Merge pull request #11046 from Trilbyspaceclone/patch-281
...
Changes the Stickmans projectile to be the correct caliber
2020-02-14 08:25:46 +01:00
Hatterhat
1276453dc4
initial commit - preservahyde
2020-02-13 21:01:28 -06:00
Artur
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
Ghommie
23f7879057
taste spam
2020-02-13 14:57:08 +01:00
Ghommie
315b0a9645
Fixes halved flavor text max length and removing some crappy code.
2020-02-13 14:05:40 +01:00
Trilbyspaceclone
7e1a35f244
projectile now deals 40 rather then 50
2020-02-13 04:00:05 -05:00
kevinz000
e4f6131dcf
Update brain_item.dm
2020-02-13 01:51:16 -07:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
kevinz000
c790478a3d
Merge pull request #11012 from keronshb/RatvarDrink
...
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
kevinz000
4e419eed03
Merge pull request #10987 from Ghommie/Ghommie-cit567
...
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
Trilbyspaceclone
34d8381b67
Update blood_drunk_miner.dm
2020-02-12 15:21:17 -05:00
Trilbyspaceclone
ba8c7b191c
Update stickman.dm
2020-02-12 14:52:24 -05:00
Ghom
8c2801fda6
Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
...
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
2020-02-12 11:14:27 +01:00
Ghom
0917617543
Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2
...
improves getImplant by using locate()
2020-02-12 10:33:08 +01:00
kevinz000
f247c6d8c6
Update pai_defense.dm
2020-02-11 04:27:22 -07:00
kevinz000
58db43621d
Merge pull request #10941 from Ghommie/Ghommie-cit561
...
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
keronshb
42fda3d88b
CogChamp
...
Adds the CogChamp drink! Bloodcult gets one so why not Clock?
2020-02-10 21:18:51 -05:00
kevinz000
520dd57bf9
Update mob_helpers.dm
2020-02-10 04:33:27 -07:00
kevinz000
276f4b5fae
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
2020-02-10 04:32:01 -07:00
kevinz000
690c14a716
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
2020-02-10 04:29:22 -07:00
Ghom
c8a62e7acf
Merge pull request #10985 from r4d6/Dwarf
...
Dwarven Update
2020-02-10 12:23:23 +01:00
kevinz000
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
kevinz000
79146bce9b
Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3
...
Fixes AI unanchoring not properly removing the no teleport trait.
2020-02-10 04:15:29 -07:00
kevinz000
c9e5fd1c17
Merge pull request #10988 from YakumoChen/master
...
Reverts 10486 (Observe verb in the Ghost tab)
2020-02-10 04:14:33 -07:00