cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,222 Commits 8 Branches 26 Tags
0f593fe087b2bce70c75bec093ecb5f5a73577df
Commit Graph

6391 Commits

Author SHA1 Message Date
Leshana
a8dbd7627d Converts our own uses of PoolOrNew to use just new() 2017-05-16 00:26:56 -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
Arokha Sieyes
d1b37bf481 Split HoS locker into two 2017-05-09 11:10:14 -04:00
Arokha Sieyes
7058806865 Ports 'head' guns from Eris, change Hunter sprite 
RD: Bluespace Harpoon
HoS: Lamia handgun
HoP: Holdout E-Gun
A few other unused ones included in code.
 2017-05-09 02:42:32 -04:00
Leshana
8fbaa446d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 2017-05-08 21:24:15 -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
cae50c2818 Merge pull request #3428 from Anewbe/explosions 
Explosion sounds
 2017-05-08 19:12:32 -05: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
2771747bb2 Radio Tweaks 
Intercom sprite change, fix centcom headset sprite to be unique, add 'NT' headset.
 2017-05-07 23:35:25 -04:00
Anewbe
bce6db1135 Fixes another thing 2017-05-07 18:15:54 -05:00
Arokha Sieyes
199e8f3656 Fix for Uplink Runtimes 2017-05-07 16:51:55 -04:00
Anewbe
51d07afdc3 Dunno how it compiled last time 2017-05-07 14:02:43 -05:00
Anewbe
12e13e7f67 Explosion sounds 2017-05-06 21:34:38 -05: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
LorenLuke
11dc8f23a6 Explosions affect items on turf before the turf itself. 2017-05-05 11:51:53 -04:00
LorenLuke
d49ec95acd Explosions affect items on turf before the turf itself. 2017-05-05 11:42:22 -04:00
Leshana
ad8789dc8c Make the multi-z explosion strength scalar configurable. 
* Its much easier to test out and decide what explosion scalar is nice if you can configure it.
* As an added bonus, by setting it to zero this lets you disable multi-z explosions altogether without turning off all of multi-z.
 2017-05-04 21:14:42 -04:00
Anewbe
75ae42ca81 Fixes a thing 2017-05-04 21:14:07 -04:00
Anewbe
1feba48827 Ports MultiZAS 2017-05-04 21:13:53 -04:00
Leshana
347e759b10 Make the multi-z explosion strength scalar configurable. 
* Its much easier to test out and decide what explosion scalar is nice if you can configure it.
* As an added bonus, by setting it to zero this lets you disable multi-z explosions altogether without turning off all of multi-z.
 2017-05-04 20:27:15 -04:00
Anewbe
092c2100cc Fixes a thing 2017-05-04 19:51:55 -04:00
Anewbe
cce1fcc1f5 Ports MultiZAS 2017-05-04 19:51:54 -04: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
Neerti
0c848e2fd7 Merge pull request #3392 from Anewbe/embed_things 
Makes it so things actually embed again.
 2017-05-03 16:06:59 -04: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
Neerti
f4c2dd24ef Merge pull request #3399 from Yoshax/injectors 
Kinda reworks Hyposprays/Autoinjectors
 2017-05-03 08:23:44 -04:00
Leshana
12bc03157a Adds the Algae Oxygen Generator 
* This device converts CO2 to O2 using power and "algae".  The extra carbon is a byproduct in the form of "graphite"
* This is intended for virgo3b, which has no oxygen in its atmosphere but enough CO2 for us to just extract it.
 2017-05-03 01:54:55 -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
Leshana
31250690e5 Fixed the escape tram to actually work 
* Made it actually work.
* Made the doors work nicely.
* Sped up the animations.
* Fixed the chairs.
 2017-04-30 19:56:58 -04:00
Anewbe
ed472a36d2 Merge pull request #3402 from LorenLuke/Communicator-Video 
Can view active video calls that you camera'd out of.
 2017-04-30 16:55:17 -05:00
LorenLuke
ee5e011c6c Can view active video calls that you camera'd out of. 2017-04-30 14:39:08 -07:00
Yoshax
03ff489f7a Kinda reworks Hyposprays/Autoinjectors 2017-04-30 17:13:00 +01:00
Cerebulon
36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Anewbe
3173baaec1 Adds a minimum 5% chance to embed 2017-04-29 10:03:43 -05:00
Cerebulon
339b269393 Adds 23 new skirt versions of existing suit sprites. 
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
 2017-04-29 12:01:40 +01:00
Leshana
fc4856bba4 Committing on behalf of Dhaeleena 2017-04-28 21:48:17 -04:00
Anewbe
35d7c673af Makes it so things actually embed again. 2017-04-28 18:23:21 -05:00
Leshana
749073b2ba Work on tether-1 and tether-3 
* Completed atmospherics piping on z5,6,7
* Fixed missing firelocks on 1-7
* Added preliminary cargo sort logic.
* Fixed surgery sign.
 2017-04-27 23:08:41 -04:00
Arokha Sieyes
418db00c19 Stasis Bag and Sleeper Changes 2017-04-27 21:47:52 -04:00
Arokha Sieyes
a7929544e7 Revert beds to Polaris sprites 2017-04-26 13:14:28 -04:00
Anewbe
9204176d58 Advanced medical stacks now heal some damage 2017-04-26 11:12:08 -05:00
Neerti
d89a3a4498 Merge pull request #3366 from LorenLuke/Self-Handcuffs 
Can now apply handcuffs to oneself.
 2017-04-25 23:43:06 -04: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
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
LorenLuke
c0be57b200 Adds adjacency check. 2017-04-25 10:55:21 -07:00
LorenLuke
3c4ff5e0bb Can now apply handcuffs to oneself. 2017-04-24 15:43:07 -07:00
Anewbe
5f9bdc5748 Merge pull request #3349 from LorenLuke/Body-Bag 
Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags.
 2017-04-24 13:43:59 -05:00