Ghommie
c75774e67a
Actual var.
2020-02-01 06:20:23 +01:00
Ghommie
ef3789eeb2
Playback device peeve.
2020-02-01 06:18:22 +01:00
Ghom
5257ab2e00
Merge pull request #10559 from Seris02/custompie
...
custom reagent pie smite
2020-02-01 01:46:15 +01:00
Ghom
7fdabe81ab
Merge pull request #10776 from Hatterhat/hecksuitgolres
...
heck suit resistances - goliath resistance and also acid-proof
2020-02-01 01:44:54 +01:00
Ghom
327bfcac2f
Merge pull request #10786 from Commandersand/frick
...
made the centcomm suit syndies order be a variant with no sensors
2020-02-01 01:42:55 +01:00
Ghom
1c5fe85545
Merge pull request #10793 from Tupinambis/MaskBugFix
...
Masks are now PROPERLY hidden my headgear that hides masks (Spacesuits, Hardsuits, Rad Hoods, Etc.)
2020-02-01 01:41:36 +01:00
Lin
4ced8f62fa
Merge pull request #10790 from Citadel-Station-13/Ghommie-patch-1
...
A little load_character() fix: removing gender restrictions for undergarments/hair styles yet again.
2020-01-31 17:03:40 +00:00
Lin
ad4a4b3797
Merge pull request #10782 from Citadel-Station-13/kevinz000-patch-16
...
nonlethal dueling pistols are now not access locked, lethal ones are now armory locked. also, dueling pistols show their duel datum id (which is added) for better finding when you have many pairs.
2020-01-31 16:58:47 +00:00
Ghom
0f4ea974c4
Merge pull request #10795 from ShadeAware/master
...
FIXES THE SWITCHBLADE CRAFTING THING
2020-01-31 04:39:27 +01:00
ShadeAware
5b43b2fac7
Update recipes_weapon_and_ammo.dm
2020-01-30 17:01:28 -05:00
Lin
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
Tupinambis
e5ee5595e0
How the fuck was this not fixed for like a year.
2020-01-30 15:22:41 -06:00
Ghom
15e5f0ef5d
Merge pull request #10644 from ShadeAware/master
...
Craftable Switchblades: The Finale
2020-01-30 21:30:55 +01:00
Ghom
d92a67f582
I'm sorry what?
2020-01-30 18:08:43 +01:00
Ghom
63560e191e
A little load_character() fix: re-re-removing gender restrictions for underwear/hair styles.
2020-01-30 18:03:58 +01:00
loginsandylogout
7054e697db
spacing
2020-01-30 02:07:59 -06:00
Commandersand
27c915ec75
honk
2020-01-30 02:04:48 -06:00
kevinz000
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
Ghom
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
Ghom
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
kevinz000
831fafb72b
Update dueling.dm
2020-01-29 19:06:11 -07:00
kevinz000
562659b5b8
Update dueling.dm
2020-01-29 19:00:11 -07:00
Ghom
f74475a6e0
Merge pull request #10749 from kevinz000/duke_moxley
...
It's high noon...
2020-01-30 00:19:37 +01:00
kevinz000
e3a3c8f241
woops
2020-01-29 15:45:57 -07:00
Hatterhat
41a3dc64d5
what
2020-01-29 16:44:01 -06:00
Lin
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
Lin
293e6576c8
Merge pull request #10564 from kevinz000/optimization_1
...
Experimental optimizations
2020-01-29 19:25:13 +00:00
r4d6
c57dedd808
fix
2020-01-29 12:30:05 -05:00
Ghom
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
Ghom
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
Ghom
44c141f009
Merge branch 'master' into hugbox_meteor_time
2020-01-29 02:28:12 +01:00
Ghom
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
kevinz000
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
Putnam3145
6d6c101044
Merge pull request #10713 from Citadel-Station-13/kevinz000-patch-7
...
[s] botany logging
2020-01-28 16:57:50 -08:00
kevinz000
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
Putnam3145
a00d1fb05e
Merge pull request #10729 from Citadel-Station-13/kevinz000-patch-5
...
The meteor wave report time to impact is now accurate (tip you were getting 2-3 minute warnings all along)
2020-01-28 16:56:50 -08:00
kevinz000
96df844aa3
Merge pull request #10754 from MalricB/Virgomangood
...
Reunites Shaggy (hair from virgo) with Scooby Terrowin
2020-01-28 17:56:11 -07:00
kevinz000
3d3086ac23
Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
...
An oversight with one of the new area helper procs.
2020-01-28 17:55:39 -07:00
kevinz000
9dfcef68ed
Merge branch 'master' into duke_moxley
2020-01-28 17:53:08 -07:00
kevinz000
9cf02ac96f
moth sounds
2020-01-28 17:36:10 -07:00
Ghom
fa5a69523b
Merge pull request #10414 from CameronWoof/lights-booooooooooooooi
...
The Great Citadel De-Pissening of 2020
2020-01-28 18:12:30 +01:00
Ghom
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01:00
Putnam
cfd65d812a
Makes gender change potion not work on people with pref
2020-01-27 19:13:50 -08:00
Ghom
2bf27e84e6
Merge pull request #10709 from Seris02/mammaltoxin
...
Adds mammal mutation toxin to green slime extract recipes
2020-01-28 04:06:01 +01:00
Putnam3145
209b681db1
Merge pull request #10706 from Ghommie/Ghommie-cit530
...
...? ...? (masked human mob examine pet peeve)
2020-01-27 19:02:13 -08:00
Ghom
362f0e57a4
Giving a hand.
2020-01-28 03:24:39 +01:00
Winter Flare
5883124e0d
Removals.
...
Removed:
CBT Interrogation
Pastry Crate
Candlelit Dinner Crate
Pest Control Crate
2020-01-27 20:47:28 -05:00
Ghommie
5875f2578c
demodularize and removes lot of unused clothing with missing sprites.
2020-01-28 02:32:46 +01:00
Winter Flare
24388f4fc1
Reverts Path changes.
2020-01-27 20:30:06 -05:00