cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,518 Commits 5 Branches 0 Tags
ece202d777c59a0c45db213512a9b54bdee933d5
Commit Graph

27016 Commits

Author SHA1 Message Date
Arokha Sieyes
ece202d777 Merge pull request #1591 from VOREStation/aro-SPECIES 
Properly hide traits already selected
 2017-05-30 17:08:22 -04:00
Arokha Sieyes
a8a668b7b3 Make cancel work on trait list 2017-05-30 15:12:04 -04:00
Arokha Sieyes
a94887af27 Properly hide traits already selected 2017-05-30 14:47:39 -04:00
Arokha Sieyes
271084e22c Merge pull request #1586 from VOREStation/aro-SPECIES 
Trait Tweaks
 2017-05-30 11:48:58 -04:00
Arokha Sieyes
d6cb4590dd Tweak spacing on setup, fix DNA bug 2017-05-30 11:39:12 -04:00
Arokha Sieyes
684f570d0d Trait Tweaks 
Adds blood color as a custom species setting
Adds photoresistant trait
Changes haste and slowdown traits to be taj and tesh speeds
 2017-05-30 11:35:40 -04:00
Layla Crosse/Occula Drenn
6d4e0695f9 Fixing Ariana's taurhalf 2017-05-30 00:37:03 -04:00
Arokha Sieyes
dfa560d06b Allow 5 traits 
`balance intensifies`
 2017-05-29 23:29:32 -04:00
Layla Crosse/Occula Drenn
559c01b439 Ariana's Centipede Taurhalf. (#1585) 
* Adds Ariana Centipede taur

* Add files via upload

* Adding Ariana's taurhalf.

UPLOADING THE RIGHT FILE THIS TIME.

* Adding Ariana's Centipede taur

Please.   Please I'm going insane.

* Adding Ariana's taurhalf

I want death.
 2017-05-29 21:13:53 -04:00
Arokha Sieyes
5ccb939531 Merge pull request #1583 from VOREStation/aro-SPECIES 
Custom Species Trait System
 2017-05-29 17:49:45 -04:00
Arokha Sieyes
d9c845a298 Don't sanitize out Custom Species unless they are changing species 2017-05-29 17:19:03 -04:00
Arokha Sieyes
1c153f7063 Merge pull request #1582 from killer653/master 
Gives Vorrakul a mouse plushie
 2017-05-29 14:17:02 -04:00
killer653
9316d49972 Gives Vorrakul a mouse plushie 
Resolves #1576
 2017-05-29 13:20:31 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
killer653
d2fa930662 Returns one 2017-05-28 23:55:23 -04:00
killer653
a52bac9f1c Makes it so mice can't eat people. 
http://i.imgur.com/Huc8Ikk.jpg
It was causing a lot of bugs
 2017-05-28 18:48:20 -04:00
Arokha Sieyes
93770b3be7 Changes emergency box to have goggles, mask, and O2 tank in it. 
Just goggles for synths.
 2017-05-27 03:10:43 -04:00
Arokha Sieyes
9fef32f585 Goggles are airtight 
Adds some 'plain' goggles that are airtight, and as such protect your eyes from things like phoron. Also allows eyewear to protect you from phoron if it's airtight (and hiding your eyes). Added airtight flag to science goggles, welding goggles, and 'plain' goggles I added. Weldning goggles only protect your eyes when down, since it removes the covers eyes flag when up.
 2017-05-27 03:03:45 -04:00
Arokha Sieyes
9f7d6269bc Merge pull request #1566 from VOREStation/vplk-tether-map-datums 
Switch Tether over to use the map_z_level datum.
 2017-05-26 23:05:08 -04:00
Arokha Sieyes
c8eb369ed8 Merge pull request #1564 from VOREStation/polaris-merge-2017-05-26 
Polaris Sync 2017 05 26
 2017-05-26 19:27:06 -04:00
Leshana
f4b9676bdc Switch Tether over to use the map_z_level datum. 
* Integrate the holomap settings into the map datum.
* Create map_z_level datums for the tether.
 2017-05-26 18:57:07 -04:00
Leshana
47a0622ccb Temporarily adjust our holomap overrides to account for the incoming enhancements. 2017-05-26 18:23:54 -04:00
Leshana
8c8e04a0a0 Converted VOREStation custom guns and ammo to handle the swap of 5.56 and 7.62 ammo. 
* Swapped our loot drops and guns to keep the damage of loot and guns the same.
* Edited the c762 magazine definition back to keep the same ammo count in each magazine type as before.

Conversion chart used:
==OLD==     max_ammo    ==NEW=      max_ammo
a556        10          s762        10
a556m       20          c762        (20)

s762        10          c556        20
c762        20          c556/ext    30
a762        50          a556        50
 2017-05-26 17:54:04 -04:00
Leshana
8e93d971fb Revert back "Tweaks hallucinations from the supermatter" 
VOREStation prefers only mesons protect from supermatter hallucinations, so keeping the code the way it was pre-sync.
This reverses commit ed66150523.
 2017-05-26 16:21:31 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
 2017-05-26 15:29:46 -04:00
Arokha Sieyes
797341bbfa Merge pull request #1561 from VOREStation/vplk-turbolift-fire-mode 
Turbolift Firefighter Mode
 2017-05-26 14:55:13 -04:00
Leshana
28b73d7868 Adds "firefighter mode" to turbolifts 
* Adds a priority call mode that allows heads and first responders to cancel all calls and summon the lift to their floor immediately.
* Adds a firefighting mode that turns the lift over to manual control, doors only open when manually opened, all call buttons ignored.  For use during fires.
 2017-05-26 14:45:00 -04:00
Yoshax
f8c73635da Adds vorrarkul's custom item 2017-05-26 19:36:29 +01:00
Leshana
4f5c66e94f Allow turbolift automapping to build a lift without elevator car walls. 
* Relying on external walls prevents the need for double-thick walls that take up more space.  Useful for some maps.
 2017-05-26 14:02:53 -04:00
Leshana
f61d4ecaaa Turbolift bugfix: Refresh inner panel dialog 
* Refresh when we push buttons to see the effect of what we did.
* Refresh when we remove floors from the queue to see the highlighting update.
 2017-05-26 14:02:40 -04:00
Neerti
aad701fee7 Merge pull request #3463 from VOREStation/multiz-consoles 
Multiz consoles
 2017-05-26 12:06:49 -04:00
Yoshax
fbec354c51 Fixes AMI suit issue 2017-05-26 02:09:32 +01:00
Leshana
dfbba572cf Prevent falling from sudden gravity restoration if buckled. 
* Also stops the floating animation while you're buckled, so you know.
* Resolves https://github.com/VOREStation/VOREStation/issues/1458
 2017-05-25 18:07:32 -04:00
Arokha Sieyes
70e03f2377 Merge pull request #1553 from VOREStation/sundry-runtimes2 
Sundry runtimes 2
 2017-05-25 16:39:39 -04:00
Arokha Sieyes
781ff2fc31 Merge pull request #1550 from Yoshax/wahwahwah 
Adds wah's custom item
 2017-05-25 16:38:54 -04:00
Arokha Sieyes
39aceafcbf Merge pull request #1549 from VOREStation/aro-jamlonger 
Reduce jammer power consumption
 2017-05-25 16:27:00 -04:00
Arokha Sieyes
7148034a0f Merge pull request #1547 from Yoshax/rigshit 
Does a real big critical fix or something with hardsuits
 2017-05-25 16:26:36 -04:00
Arokha Sieyes
17f1bedc29 Merge pull request #1546 from VOREStation/aro-emtsuit 
Rework the Rescue Hardsuit
 2017-05-25 16:26:00 -04:00
Yoshax
cdc36ed4f2 Closes a span 2017-05-25 19:18:13 +01:00
Yoshax
3fb4ac2cdf Adds wah's custom item 2017-05-25 18:20:54 +01:00
Arokha Sieyes
25808b524a Reduce jammer power consumption 
It's for the ERPs yo. And you can always find it by just walking around a bit and listening to the static if someone uses them for robust purposes (probably a lot more rare on our server).
 2017-05-25 12:09:29 -04:00
Yoshax
5b95b08c44 Ensures rigsuit pieces are protected from Phoron when deployed 2017-05-25 15:42:15 +01:00
Spades
b88675bb82 Closed the span 2017-05-25 00:26:19 -04:00
Arokha Sieyes
054d580e84 Rework the Rescue Hardsuit 
Module 1: Maneuvering Jets - Jetpack, fwoosh.
Module 2: Sprinter - Gotta go fast!
Module 3: PATS Module - Opens doors you have access to 3 steps ahead of you, and has an (expensive) option to override an airlock you're facing, though this notifies command and sec of you doing this over radio.
Module 4: Micro Pharmacy - Contains 10u inaprovaline, tricordrazine, tramadol, and dexplus, each, and can have regeneration enabled to slowly regenerate these four drugs in exchange for energy.

(Also fixed a thing with the resleeving computer and disk while I was in there)
 2017-05-24 21:10:16 -04:00
Leshana
ae270c6938 Adjusts random events to be more suitable for the Tether 
Fixes #1542  Fixes #1396
* Disables the Supply Demand event until it can be reworked to be more interesting.
* Removes volatile fuel from the possible gases leaked in Atmos Leak event.
* Excludes areas around spawn points from the Atmos Leak event.
* Prevents gravity failure from disabling gravity on planetary z levels.
 2017-05-24 17:08:39 -04:00
MagmaRam
a7d99942f4 Merge pull request #3443 from Anewbe/sifDefenseForce 
[Lore] Renames the Sif Homeguard to Sif Defense Force
 2017-05-23 20:38:44 -05:00
Anewbe
475756bb8d Merge pull request #3466 from Schnayy/clothing_pack_1 
Adds 4 new clothing sprites & puts them in the loadout.
 2017-05-23 20:26:32 -05:00
Leshana
5b840b1591 Runtime in living_vr.dm,197: Cannot read null.prefs_vr 2017-05-23 21:04:27 -04:00
Leshana
a4c6496720 Fixes Runtime in lattice.dm,41: undefined proc or verb /turf/simulated/floor/airless/update(). 2017-05-23 21:03:39 -04:00
Arokha Sieyes
900432bac0 Merge pull request #1535 from Jakksergal/master 
Tail Sprite Additions/edits
 2017-05-23 19:40:34 -04:00