cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,018 Commits 8 Branches 26 Tags
b188fae46b005b6994834da8c19f4bc7e5955255
Commit Graph

16840 Commits

Author SHA1 Message Date
Yoshax
b188fae46b Fixes an issue where a non-existent language was existing + some normalisation 2017-05-20 17:52:24 +01:00
Arokha Sieyes
f445a9c725 Merge pull request #1473 from Cameron653/master 
Serdy desc changes, serdy gun whitelist.
 2017-05-17 20:45:14 -04:00
killer653
8100fd3635 Adds SilencedMP5A5's permit 2017-05-14 16:35:04 -04:00
Screemonster
691aa28eba Adds a whole bunch of markings 2017-05-14 05:31:10 +01:00
killer653
fe767f44b5 Literally right after I submitted the PR 2017-05-11 15:36:09 -04:00
killer653
a535948e90 Serdy desc changes, serdy gun whitelist. 2017-05-11 15:30:52 -04: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
88f0e65cf9 Converts our own uses of PoolOrNew to use just new() 2017-05-08 21:24:47 -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
Neerti
1f737cb826 Merge pull request #3427 from Anewbe/straight_jacket 
Fixes a straightjacket bug
 2017-05-07 14:12:26 -04:00
Anewbe
32271f7ae6 Merge pull request #3425 from Yoshax/hair 
Ports a bunch of hair from Bay
 2017-05-07 11:34:46 -05:00
Anewbe
5bed51da31 Fixes a straightjacket bug 2017-05-06 15:40:38 -05:00
Neerti
1d5afefea9 Fixes Logic Circuits 
They should now function properly.
 2017-05-06 16:35:06 -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
Anewbe
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits 
Adds 24 new skirt versions of suit sprites.
 2017-05-05 21:55:14 -05:00
Datraen
97e7e10bc2 Fixes mutate() in xenobio2 to produce a unique traits datum 
Recently brought to me, so I'm fixing it.
 2017-05-05 12:23:00 -04:00
Anewbe
83382e5f9d Fixes a thing 2017-05-04 20:53:59 -05: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
40be042005 Add's Tempest's custom implant item (#1461) 
* Implant stuff

Does more implant stuff

Does even more implant stuff

EVEN MOAR IMPLANT STUFF

Adds Tempest's custom fluff implant along with the generalized parent type

* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana

* Last commit maybe? Yay?
 2017-05-03 22:09:07 -04:00
Arokha Sieyes
c4fd243694 Merge pull request #1460 from VOREStation/aro-adranol 
Adds Adranol
 2017-05-03 22:08:47 -04:00
Arokha Sieyes
a3bf1b2492 Merge pull request #1457 from Yoshax/permitguns 
Adds Aerowing and Table's custom item/gun stuff
 2017-05-03 22:08:26 -04:00
JoanRisu
88e5fe0ead Resolves #1188 and #794 (#1427) 
* resolves  #1188 and #794

* Moves custom taur armor stuff to the fluff items file. Adds comments to items for organizational purposes.

* Fixes

* Additional fixins

* Thanks Travis
 2017-05-03 22:07:38 -04:00
Anewbe
b12a46ffb7 Merge pull request #3409 from Yoshax/missfix 
Simple fix for #3374
 2017-05-03 20:45:36 -05:00
Yoshax
eda674eca0 Attack fix 2017-05-04 01:21:47 +01:00
Neerti
fedef20a53 Merge pull request #3312 from Anewbe/dice_thing 
Adds the Liar's Dice game
 2017-05-03 16:02:18 -04:00
Anewbe
393dec4e2b Merge pull request #3408 from Yoshax/floralsomatoray 
Adds Gene Targetting mode to Floral Somatoray
 2017-05-03 14:50:18 -05:00
Yoshax
93db79b99e Removes a stray world log 2017-05-03 14:29:43 +01:00
Datraen
3d442044d1 Adds Gene Targetting mode to Floral Somatoray 
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.

No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
 2017-05-03 13:33:58 +01:00
Neerti
f4c2dd24ef Merge pull request #3399 from Yoshax/injectors 
Kinda reworks Hyposprays/Autoinjectors
 2017-05-03 08:23:44 -04:00
Anewbe
100ab0528f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-05-02 11:13:53 -05: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
Anewbe
d69ba93969 Merge pull request #3401 from VOREStation/aro-pol-holomulti 
Allows more than one holodeck
 2017-05-02 09:36:31 -05:00
Arokha Sieyes
bb2e10151c Adds Adranol 
Adranol fixes jittery, eye_blurry, and confusion, and would be good as a post-resleeving drug. It'd also be the only drug that can actually fix jitteryness, since there is no way to undo that now.
 2017-05-01 16:03:11 -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
Neerti
797363231e Merge pull request #3397 from Anewbe/practice_carbine 
Fixes an issue with the practice laser carbine
 2017-05-01 15:40:24 -04:00
Yoshax
c939cf1842 Adds Aerowing and Table's custom item/gun stuff 2017-05-01 14:26:14 +01:00
Neerti
6de110303e Merge pull request #3400 from LorenLuke/Limb-sever-speed 
Limbs no longer sever at supersonic speeds.
 2017-04-30 21:16:39 -04:00
Arokha Sieyes
db43334024 Allows more than one holodeck 
The current code does not account for there ever being more than one holodeck. This alters it so that you can make various subtypes of the holodeck computer for other areas, each with different loadable programs.
 2017-04-30 16:53:55 -04:00
Yoshax
a3f9186e2a Ensures icons update when reagents change 2017-04-30 21:25:06 +01:00
LorenLuke
a8c0247902 Limbs no longer sever at supersonic speeds. 2017-04-30 09:58:25 -07:00
Yoshax
03ff489f7a Kinda reworks Hyposprays/Autoinjectors 2017-04-30 17:13:00 +01:00
Anewbe
6a7ff91e60 Fixes two spelling errors 2017-04-30 10:46:31 -05:00
Anewbe
3205631de3 Fixes an issue with the practice laser carbine 2017-04-30 10:26:05 -05:00
Cerebulon
f86fa63a60 Fixed inhand sprites for a few suits. 2017-04-30 04:43:11 +01:00
Cerebulon
36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Arokha Sieyes
ae96b83098 Merge pull request #1436 from LiquidFirefly/master 
Gazer Fluff.
 2017-04-29 19:55:28 -04:00