313ba00dd5
Deathsquads no longer get shielded hardsuits
2017-08-15 09:59:51 -05:00
1cc9a1decf
set xeno standard parts to be default
2017-08-15 08:06:59 -06:00
22ad3c6afe
xeno markings addition
...
added markings to the xenomorph, for polish
2017-08-15 08:03:08 -06:00
402b9a6cab
Fixes mining hardsuit heat_protection
2017-08-15 05:55:57 -05:00
3b1a0a0dc0
Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon
2017-08-15 05:11:08 -05:00
905cb4a3e8
Merge pull request #2278 from Citadel-Station-13/upstream-merge-29651
...
[MIRROR] Fixes hair sticking through hats.
2017-08-14 20:48:21 -05:00
31b501aa1a
Merge branch 'master' into upstream-merge-29885
2017-08-14 19:41:45 -05:00
bda5e94afc
Merge pull request #2365 from Citadel-Station-13/upstream-merge-29886
...
[MIRROR] Fix compile warning
2017-08-14 19:41:03 -05:00
1d4e15502a
Update browserOutput.dm
2017-08-14 19:40:45 -05:00
77025ae8a2
Merge branch 'master' into upstream-merge-29651
2017-08-14 19:37:09 -05:00
f2c011a37b
Update console.dm
2017-08-14 18:55:25 -05:00
e5cd79a14e
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
...
[MIRROR] Moved can_trigger_gun to item/weapon parent
2017-08-14 18:53:38 -05:00
6d62d51eab
Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
...
[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
ce918273bc
Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779
...
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
2017-08-14 18:45:28 -05:00
9b57f5fd62
Update collectable.dm
2017-08-14 18:39:22 -05:00
46c6a54a75
Update misc.dm
2017-08-14 18:38:55 -05:00
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
048c782156
xenomorph update
...
A long overdue overhall and readdition of xenos
2017-08-14 17:09:11 -06:00
97243fca3a
Moved can_trigger_gun to item/weapon parent
2017-08-14 16:05:43 -05:00
822cddc718
Update Hallucination.dm
2017-08-14 08:55:45 -05:00
80bb075eb3
Update Hallucination.dm.rej
2017-08-14 08:24:58 -05:00
fdfdd4fc21
Update admin_investigate.dm
2017-08-14 08:24:34 -05:00
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
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
2476d59be6
Makes the ahelp topic give the permissions warning
2017-08-14 06:54:44 -05:00
f840a18a9a
Fix compile warning
2017-08-14 02:59:42 -05:00
7fe8dd208d
[s] Clean up some inputs
2017-08-14 02:44:24 -05:00
726ffe1fdd
Tweaks atmos canister lights.
2017-08-14 01:25:02 -05:00
16428315aa
Merges the two turf/Entereds
2017-08-13 18:01:40 -05:00
0e7b9a008e
Ports a slightly edited version of Eris APC sprites
2017-08-13 17:54:27 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
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
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
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
fdfb61b527
Update client_procs.dm
2017-08-13 09:50:51 -05:00
deffc1b1f1
More baseturf helpers
2017-08-13 01:28:20 -05:00
dae3e121f2
critical priority roleplay grammatical patch (*surrender emote fix)
2017-08-13 01:28:16 -05:00
714fc5ed4a
Fixes minebots missing action icons
2017-08-13 01:27:58 -05:00
3f562c113c
get_head_slots() now returns wear_neck
2017-08-13 01:27:54 -05:00
501972a2f8
Removes chat pings from href logs
2017-08-13 01:26:46 -05:00
6cb9a0088f
Fixes admin mass deleting... not actually mass deleting...
2017-08-13 01:26:39 -05:00
f615bc0dff
Merge pull request #2342 from Citadel-Station-13/bear-fix
...
Bear ears/tails fix
2017-08-12 07:05:38 -05:00
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
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
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
73426d56ea
file path fix
2017-08-12 06:31:50 -05:00
5a7126a0dd
Panic Bunker for moderator/trialmin access
2017-08-12 01:15:42 -05:00
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
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
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
CitadelStationBot