Commit Graph

7693 Commits

Author SHA1 Message Date
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Arokha Sieyes
2ea6c0bc17 Merge pull request #1490 from VOREStation/aro-sanom
Fix 2 SA problems
2017-05-20 15:17:35 -04:00
Arokha Sieyes
5bc3d7ba22 Merge pull request #1491 from Yoshax/lang
Fixes an issue where a non-existent language was existing + some normalisation
2017-05-20 15:14:30 -04:00
Yoshax
3d63880041 Adds defines cause who wants problems 2017-05-20 18:11:20 +01:00
Yoshax
b188fae46b Fixes an issue where a non-existent language was existing + some normalisation 2017-05-20 17:52:24 +01:00
Arokha Sieyes
19e9b351ac Fix 2 SA problems
Missing the Animal Nom verb when playing as an animal, and the ID doesn't get read if you have one.
2017-05-20 03:10:39 -04:00
Arokha Sieyes
47303fe7d1 Adds Wahs
Dem red panders.
2017-05-19 17:27:02 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Leshana
d5eb86d810 Transfer talking and visible messages upwards thru open space.
Mobs speaking and doing things that emit visible messages will now be seen on floors above, including the icons.
2017-05-15 20:37:07 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
Leshana
8b0cf0617b Fix VOREStation use of color macros so we pass the new stringent macro tests. 2017-05-08 22:34:13 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Arokha Sieyes
c541122123 Convert to using Mediamanager lobby music
Update the JSON!
2017-05-08 02:33:46 -04:00
Yoshax
c808a6fb66 Removes Unathi from chin bob 2017-05-06 20:27:28 +01:00
Yoshax
6635857cf1 Ports a bunch of hair or something 2017-05-06 19:37:55 +01:00
sabiram
6cfc825f53 Adds and fixes some hairstyles 2017-05-06 19:30:59 +01:00
SiegDerMaus
e64f0bb97b Adds Chin Length Bob
A new haircut for those who like bobs, but always hated how short the
one already in game is.
2017-05-06 19:26:22 +01:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Yoshax
eda674eca0 Attack fix 2017-05-04 01:21:47 +01:00
Neerti
ccb5e5700b Merge pull request #3387 from VOREStation/aro-pol-zzz
Stasis Bag and Sleeper Changes
2017-05-02 12:09:33 -04:00
Neerti
ea2945f88f Merge pull request #3380 from Anewbe/item_slowdown_mod
Tweaks how item slowdown works with species vars
2017-05-01 15:40:56 -04:00
Arokha Sieyes
ae96b83098 Merge pull request #1436 from LiquidFirefly/master
Gazer Fluff.
2017-04-29 19:55:28 -04:00
Yoshax
612e7f3b64 Syncs some missed changes from Polaris (#1445)
* Adds in some missed changes from Polaris

* Fixes the changelog by taking it straight from Polaris
2017-04-29 19:31:02 -04:00
Arokha Sieyes
58fec31ea4 Allows 'escaping' sleepers, among other things
Added some helper procs for stasis things, and also allows using grabs on sleepers like the advanced scanner because that inconsistency between the machines was bothering me.
2017-04-29 18:59:28 -04:00
Layla Crosse/Occula Drenn
a77def9829 Add's LiquidFirefly's Gazer fluff item stuff
Add files via upload

Add files via upload

Add files via upload

Added Gazertail to repository, fixed error.

Reverting bad changes.

Apologies for not reading.

Adding Monoeye.

Fixing bad changes, Readding monoeye.
2017-04-29 02:50:26 +01:00
Neerti
ec366d5d74 Makes Technomancer use modifiers, fixes a few bugs 2017-04-28 16:27:51 -04:00
Arokha Sieyes
418db00c19 Stasis Bag and Sleeper Changes 2017-04-27 21:47:52 -04:00
Anewbe
a742986015 Tweaks how item slowdown works on certain species 2017-04-26 19:03:16 -05:00
Anewbe
eda374cf83 Merge pull request #3356 from Neerti/4/23/2017_ling_nerfs
Adjusts Changelings
2017-04-25 22:04:37 -05:00
Arokha Sieyes
80670b420c Merge current master in 2017-04-25 20:14:38 -04:00
Anewbe
3fd1eb95b0 Merge pull request #3355 from Anewbe/siik
Sam is no longer in the list of words for Siik
2017-04-25 18:57:47 -05:00
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe
40e58d6f5b Merge pull request #3363 from LorenLuke/buckle-give
Fixes 3314.
2017-04-24 14:44:55 -05:00
LorenLuke
af74306b43 Fixes 3314. 2017-04-24 12:03:04 -07:00
Neerti
6dbff1ee83 Adds Drone Identification Cards
Drone FBPs now spawn with an EIO issued ID alongside their NT ID card.
Also makes the bartender's permit automatically name itself when created by the job_controller.
2017-04-23 16:30:32 -04:00
Neerti
d6683be3ce Adjusts Changelings
See PR
2017-04-23 13:22:32 -04:00
Anewbe
1442528bfb Sam is no longer in the list of words for Siik 2017-04-23 11:08:29 -05:00
Atermonera
3f1194696a Brain type is shown on all records 2017-04-22 18:18:31 -07:00
Anewbe
2e9383d6ac Merge pull request #3339 from VOREStation/aro-pol-computericon
Removes all the hard references to computer.dmi
2017-04-22 09:36:40 -05:00
Anewbe
59a19f7197 Merge pull request #3330 from VOREStation/footstep-sounds
Implements footstep sound system and adds sounds to various floor types.
2017-04-20 21:10:28 -05:00
Arokha Sieyes
647350eedb Eris Computer Icon Tweaks 2017-04-19 23:53:53 -04:00
Neerti
baac0efffb Merge pull request #3266 from Anewbe/scratch_damage
Armor soak now caps at 80% of incoming damage
2017-04-19 23:33:30 -04:00
Arokha Sieyes
0fe43a1f2b Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:54:16 -04:00
Arokha Sieyes
49b31344f5 Removes all the hard references to computer.dmi
I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist.
2017-04-19 16:51:03 -04:00
Anewbe
28caa29467 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scratch_damage
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
2017-04-19 12:55:11 -05:00
Neerti
e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe
bf7dce79cc Unathi mechanical changes (#3256)
* Unathi changes

* Tweaks blurb

* Alcohol tweaks

* Age tweak

* Slowdown

* Adds Unathi to the codex

* Fixes Unathi Organs, adds sprites

* Fixed the changelog

* Sprite and language tweaks, Unathi
2017-04-19 13:42:51 -04:00
Anewbe
93b52c138a Merge pull request #3308 from LorenLuke/Changeling-Respec
Tweaks Changeling Respecs
2017-04-19 10:32:13 -05:00
Anewbe
9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00