YakumoChen
|
65ca071eb4
|
linting??
|
2020-01-31 14:29:40 +00:00 |
|
YakumoChen
|
6c3069e944
|
less empty line
|
2020-01-31 14:15:13 +00:00 |
|
YakumoChen
|
4c4fda8091
|
line ending
|
2020-01-31 14:14:34 +00:00 |
|
YakumoChen
|
c489571d69
|
Update ring.dm
|
2020-01-31 13:55:06 +00:00 |
|
YakumoChen
|
32f3b31127
|
adds two crates
|
2020-01-31 08:54:07 -05:00 |
|
YakumoChen
|
89134d8b30
|
updates fancy
the boxes actually work now
|
2020-01-31 08:52:45 -05:00 |
|
YakumoChen
|
1ed4b90e5f
|
update fancy
|
2020-01-31 07:14:58 -05:00 |
|
YakumoChen
|
922f91b409
|
adds ring.dm to gloves
|
2020-01-31 06:34:29 -05:00 |
|
YakumoChen
|
065691ca1e
|
adds ring boxes to fancy
|
2020-01-31 06:33:13 -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 |
|
Ghom
|
15e5f0ef5d
|
Merge pull request #10644 from ShadeAware/master
Craftable Switchblades: The Finale
|
2020-01-30 21:30:55 +01: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
|
1caa2af4cf
|
Update weaponry.dm
|
2020-01-30 04:05:35 +01: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 |
|
Ghom
|
793cc26ddc
|
Update weaponry.dm
|
2020-01-30 03:28:47 +01:00 |
|
Ghom
|
096d9e01e1
|
Update weaponry.dm
|
2020-01-30 03:19:04 +01:00 |
|
Ghom
|
b2ca380a13
|
Update weaponry.dm
|
2020-01-30 03:15:24 +01:00 |
|
kevinz000
|
0e1c46150f
|
Merge pull request #10767 from KeRSedChaplain/gangnerf
Removes stim packs from gangs
|
2020-01-29 16:24:51 -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 |
|
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
|
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 |
|
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 |
|
KeRSe
|
9c18d4fdad
|
makes stimulants no longer purchasable by gangs
|
2020-01-28 15:53:29 -05: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 |
|
kevinz000
|
a1a2d45be6
|
Update closets.dm
|
2020-01-28 02:41:04 -07: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 |
|
Ghom
|
f1197c8618
|
Merge pull request #10743 from necromanceranne/SHAZBOT
Spinfusors are no longer purchasable from cargo
|
2020-01-28 02:18:32 +01:00 |
|