LetterJay
9b57f5fd62
Update collectable.dm
2017-08-14 18:39:22 -05:00
LetterJay
46c6a54a75
Update misc.dm
2017-08-14 18:38:55 -05:00
LetterJay
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
Haresay
048c782156
xenomorph update
...
A long overdue overhall and readdition of xenos
2017-08-14 17:09:11 -06:00
CitadelStationBot
97243fca3a
Moved can_trigger_gun to item/weapon parent
2017-08-14 16:05:43 -05:00
LetterJay
822cddc718
Update Hallucination.dm
2017-08-14 08:55:45 -05:00
LetterJay
80bb075eb3
Update Hallucination.dm.rej
2017-08-14 08:24:58 -05:00
LetterJay
fdfdd4fc21
Update admin_investigate.dm
2017-08-14 08:24:34 -05:00
LetterJay
cb861b28ca
Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841
...
[MIRROR] Makes the ahelp topic give the permissions warning
2017-08-14 08:21:38 -05:00
LetterJay
7c6f9c4973
Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867
...
[MIRROR] Tweaks atmos canister lights.
2017-08-14 08:20:57 -05:00
CitadelStationBot
2476d59be6
Makes the ahelp topic give the permissions warning
2017-08-14 06:54:44 -05:00
CitadelStationBot
f840a18a9a
Fix compile warning
2017-08-14 02:59:42 -05:00
CitadelStationBot
7fe8dd208d
[s] Clean up some inputs
2017-08-14 02:44:24 -05:00
CitadelStationBot
726ffe1fdd
Tweaks atmos canister lights.
2017-08-14 01:25:02 -05:00
CitadelStationBot
16428315aa
Merges the two turf/Entereds
2017-08-13 18:01:40 -05:00
CitadelStationBot
0e7b9a008e
Ports a slightly edited version of Eris APC sprites
2017-08-13 17:54:27 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
LetterJay
3876ecab9e
Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853
...
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 09:52:46 -05:00
LetterJay
d3e8815788
Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864
...
[MIRROR] Fixes minebots missing action icons
2017-08-13 09:51:45 -05:00
LetterJay
81dc5d2c09
Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826
...
[MIRROR] get_head_slots() now returns wear_neck
2017-08-13 09:51:29 -05:00
LetterJay
fdfb61b527
Update client_procs.dm
2017-08-13 09:50:51 -05:00
CitadelStationBot
deffc1b1f1
More baseturf helpers
2017-08-13 01:28:20 -05:00
CitadelStationBot
dae3e121f2
critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 01:28:16 -05:00
CitadelStationBot
714fc5ed4a
Fixes minebots missing action icons
2017-08-13 01:27:58 -05:00
CitadelStationBot
3f562c113c
get_head_slots() now returns wear_neck
2017-08-13 01:27:54 -05:00
CitadelStationBot
501972a2f8
Removes chat pings from href logs
2017-08-13 01:26:46 -05:00
CitadelStationBot
6cb9a0088f
Fixes admin mass deleting... not actually mass deleting...
2017-08-13 01:26:39 -05:00
LetterJay
f615bc0dff
Merge pull request #2342 from Citadel-Station-13/bear-fix
...
Bear ears/tails fix
2017-08-12 07:05:38 -05:00
LetterJay
c00f0a99f0
Merge pull request #2335 from ktccd/Flavor-elevator
...
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
2017-08-12 06:35:45 -05:00
LetterJay
1520c4facd
Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800
...
[MIRROR] Massively improves downloading/viewing logs.
2017-08-12 06:34:41 -05:00
LetterJay
962d983079
Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746
...
[MIRROR] Fixes adminhelp sending the wrong message to players
2017-08-12 06:33:29 -05:00
LetterJay
73426d56ea
file path fix
2017-08-12 06:31:50 -05:00
Poojawa
5a7126a0dd
Panic Bunker for moderator/trialmin access
2017-08-12 01:15:42 -05:00
ktccd
4188db53a5
Flavortext transition finished
...
Now properly moves OLD flavortext to the new format and then removes the
old format.
If no old format is found, it defaults to loading the new format.
Flavortext is now stored in your DNA, and is loaded into your characters
flavor_text variable upon creating the character or messing with the
DNA.
This allows cloners/pods/changelings to use the correct flavortext.
2017-08-11 23:48:46 +02:00
ktccd
1b2f2120ec
DO NOT MERGE - Fixes random resetting of file
...
I did a bad with the direction of >> and <<. My bad.
Fixed now, I will test FURTHER to confirm that old files are not deleted
or ruined.
2017-08-11 23:10:05 +02:00
ktccd
d7ac827ea6
Testing Transition code, DO NOT MERGE YET!!
...
As it says, do not merge until I confirm that it works.
2017-08-11 21:59:35 +02:00
ktccd
62a7d4301f
Refactored flavortext.
...
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00
CitadelStationBot
bd8289b29f
Massively improves downloading/viewing logs.
2017-08-10 10:49:22 -05:00
LetterJay
805aa06807
adds bear tails/ears to humans as well
2017-08-09 11:23:09 -05:00
LetterJay
dc502b99a6
Merge pull request #2314 from Citadel-Station-13/upstream-merge-29753
...
[MIRROR] Makes dummy humans queue instead of harddel
2017-08-09 02:22:33 -05:00
LetterJay
05cbf7927a
Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775
...
[MIRROR] Fixes repairing jumpsuits.
2017-08-09 02:22:17 -05:00
LetterJay
7b371b02e3
Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756
...
[MIRROR] Oocky in icky descriptions
2017-08-09 02:21:38 -05:00
LetterJay
9e0b151240
Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768
...
[MIRROR] Standardized CENTCOM spelling
2017-08-09 02:20:26 -05:00
LetterJay
470b19b1c1
Merge pull request #2302 from Citadel-Station-13/upstream-merge-29769
...
[MIRROR] fixes some initialize errors
2017-08-09 02:20:14 -05:00
LetterJay
f9bf13a5d9
Merge pull request #2301 from Citadel-Station-13/bears
...
adds bear ears and bear tail
2017-08-09 02:19:56 -05:00
LetterJay
a43304a1e5
Merge pull request #2300 from Citadel-Station-13/upstream-merge-29748
...
[MIRROR] Adds a Test Areas (Station Z) verb
2017-08-09 02:19:47 -05:00
LetterJay
5651bb3497
Merge pull request #2299 from Citadel-Station-13/upstream-merge-29712
...
[MIRROR] Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
2017-08-09 02:19:36 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
2004d399c9
Makes dummy humans queue instead of harddel
2017-08-08 22:26:10 -05:00
CitadelStationBot
764ebb2e5e
Fixes the Hierophant not spawning its crusher trophy
2017-08-08 22:24:01 -05:00
