cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,982 Commits 8 Branches 26 Tags
241fe7a09ae9787803f8a15e8cb2cee027b63b44
Commit Graph

21201 Commits

Author SHA1 Message Date
Aronai Sieyes
241fe7a09a Merge pull request #4007 from Little-119/prototype-trait-fix 
Fixes the prototype trait showing up
 2018-07-11 21:34:49 -04:00
Aronai Sieyes
1d5af24b35 Merge pull request #4002 from VOREStation/upstream-merge-5398 
[MIRROR] Cutting cables will now transfer fingerprints.
 2018-07-11 21:34:23 -04:00
Aronai Sieyes
0097426d41 Merge pull request #4000 from Verkister/patch-22 
Fixes itemweak gurgles ignoring food reagents.
 2018-07-11 21:33:58 -04:00
Aronai Sieyes
b547da5bfb Merge pull request #3997 from VOREStation/upstream-merge-5395 
[MIRROR] Adds four new tatoos
 2018-07-11 21:28:56 -04:00
Aronai Sieyes
5b2007a58e Merge pull request #3992 from VOREStation/upstream-merge-5392 
[MIRROR] Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-11 21:23:57 -04:00
Aronai Sieyes
799594b48f Merge pull request #3991 from VOREStation/upstream-merge-5393 
[MIRROR] Fixes a typo with cups of lime tea.
 2018-07-11 21:22:08 -04:00
Aronai Sieyes
4679dfe24e Merge pull request #3990 from VOREStation/upstream-merge-5391 
[MIRROR] Tweak i_beam qdel logic
 2018-07-11 21:21:19 -04:00
Little-119
0420b627f2 Stops the prototype trait from showing up 2018-07-09 21:48:34 -04:00
Neerti
5a221f37a4 Merge pull request #5398 from Mechoid/CablePrints 
Cutting cables will now transfer fingerprints.
 2018-07-09 11:39:31 -04:00
Verkister
d60242d2cb Fixes itemweak gurgles ignoring food reagents. 
-Fixes food/drinks/organs/etc. being utterly worthless when gurgled with itemfriendly mode.
 2018-07-09 13:30:32 +03:00
Anewbe
c84447047c Merge pull request #5395 from elgeonmb/sabsthing 
Adds four new tatoos
 2018-07-08 17:37:55 -04:00
avabee
45cfd410b2 Prevents dummy AIs from spawning with communicators or PDAs. (#5392) 
* Adds an 'is_dummy' variable to AIs.

* Prevents dummy AIs from spawning with communicators or PDAs.
 2018-07-07 14:30:27 -04:00
Anewbe
bfe15d1558 Merge pull request #5393 from avabee/patch-1 
Fixes a typo with cups of lime tea.
 2018-07-07 14:30:16 -04:00
Anewbe
f1049dd1c1 Merge pull request #5391 from VOREStation/pol-infra 
Tweak i_beam qdel logic
 2018-07-06 19:34:44 -04:00
Arokha Sieyes
633bc2cc3d Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018 
# Conflicts:
#	code/__defines/species_languages.dm
#	code/__defines/subsystems.dm
#	code/controllers/Processes/planet.dm
#	code/game/machinery/cloning.dm
#	code/game/machinery/recharger.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/paperwork/photography.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-07-06 17:20:03 -04:00
Aronai Sieyes
a8b9fa86df Merge pull request #3966 from Verkister/killborg 
Fixes sleeperbellies not ejecting contents on borg death.
 2018-07-04 19:37:39 -04:00
Anewbe
af08909d49 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 11:50:55 -04:00
Anewbe
eb690c0f00 Merge pull request #5389 from VOREStation/pol-hypo 
Fix hypospray exploit
 2018-07-04 10:50:28 -05:00
Aronai Sieyes
05989b6aa9 Merge pull request #3971 from VOREStation/upstream-merge-5385 
[MIRROR] Fix handheld Cameras
 2018-07-03 18:52:58 -04:00
Arokha Sieyes
a150728e08 Fix hypospray exploit 2018-07-03 18:05:41 -04:00
Aronai Sieyes
3b306e87f0 Merge pull request #3968 from VOREStation/upstream-merge-5375 
[MIRROR] Adds non-head of staff department cloaks
 2018-07-03 15:43:19 -04:00
Aronai Sieyes
f857592fa0 Basically undo changes 2018-07-03 15:39:58 -04:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Anewbe
2be38d8d90 Fix handheld Cameras 2018-07-03 01:23:04 -04:00
Anewbe
2a696dbbff Merge pull request #5385 from Mechoid/Camerafix 
Fix handheld Cameras
 2018-07-03 00:22:06 -05:00
Unknown
1dc914063b Fixes USDF Sprites 
Fixes #3967 for Ace
(Unfortunately I have no idea how to fix the imperial weapon sound)
 2018-07-03 01:17:11 -04:00
Anewbe
0c25bf04a0 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 20:32:14 -04:00
Anewbe
808765ff80 Merge pull request #5375 from Mewchild/MC-Cloaks 
Adds non-head of staff department cloaks
 2018-07-02 19:31:44 -05:00
Verkister
9f36a01985 Fixes sleeperbellies not ejecting contents on borg death. 
-Wow it sure took a while before we found out what was forgotten during the original citadel port.
 2018-07-02 13:28:59 +03:00
Atermonera
308c4b64e0 Renames Taj Sign Language 2018-07-02 00:49:17 -04:00
Aronai Sieyes
bb895947d9 Merge pull request #3950 from VOREStation/upstream-merge-5369 
[MIRROR] Only slimes may squish.
 2018-07-02 00:43:26 -04:00
Aronai Sieyes
c5fc48af3c Merge pull request #3942 from Novacat/nova-heterochromia 
Medical Tweaks
 2018-07-02 00:42:29 -04:00
Aronai Sieyes
2e0e39b627 Merge pull request #3949 from VOREStation/upstream-merge-5361 
[MIRROR] Ports Siik'Tajr from Baystation
 2018-07-02 00:36:20 -04:00
Aronai Sieyes
9a56255686 Merge pull request #3960 from VOREStation/upstream-merge-5379 
[MIRROR] Fixes an infinite drowsyness bug
 2018-07-02 00:32:35 -04:00
Aronai Sieyes
b23aafca9c Comment out change 2018-07-02 00:30:59 -04:00
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Mechoid
894daa8727 Fix cameras not functioning, steal https://github.com/VOREStation/VOREStation/pull/3672/files 2018-07-01 19:24:25 -07:00
Atermonera
9b237d0d5c Merge pull request #5379 from Anewbe/drowsy 
Fixes an infinite drowsyness bug
 2018-07-01 17:56:46 -04:00
Atermonera
74cb7f8f4a Merge pull request #5379 from Anewbe/drowsy 
Fixes an infinite drowsyness bug
 2018-07-01 14:56:31 -07:00
Atermonera
5064bb2f23 Merge pull request #5377 from Anewbe/taj_sign_tweaks 
Renames Taj Sign Language
 2018-06-30 15:45:40 -07:00
Anewbe
6bf2724ceb Fixes an infinite drowsyness bug 2018-06-29 17:43:11 -05:00
Unknown
14d64a5570 Duplicate PR revert and minor bugfix 
- Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream
- Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers
 2018-06-29 16:25:20 -04:00
Anewbe
f6fbe81598 Renames Taj Sign Language 2018-06-29 15:05:13 -05:00
Layne
a12778d773 Only slimes may squish. (#5369) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
 2018-06-29 15:56:20 -04:00
Layne
e7c93ebc94 Only slimes may squish. (#5369) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* Squish on my slime

* Squish on my slime
 2018-06-29 14:55:13 -05:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 15:49:56 -04:00
Anewbe
9b54e62a89 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 14:49:16 -05:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03:00
Aronai Sieyes
ed8767ce72 Merge pull request #3925 from Verkister/spicyboye 
Adds "redspace" oties.
 2018-06-28 14:34:49 -04:00
Aronai Sieyes
a082cd2a34 Merge pull request #3935 from VOREStation/upstream-merge-5374 
[MIRROR] Gloves cannot be put over Commwatches.
 2018-06-28 14:33:55 -04:00