cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,709 Commits 7 Branches 0 Tags
033e64f3c9dad1f33b1063a108ecdbbc2dbeb638
Commit Graph

24107 Commits

Author SHA1 Message Date
Aronai Sieyes
033e64f3c9 Combat drone sprite 2020-03-21 21:20:50 -04:00
Novacat
90e6e1fea2 Update lighting.dm 2020-03-21 16:47:52 -04:00
Atermonera
9f250ce3c9 Emergency lighting 2020-03-21 16:39:36 -04:00
Aronai Sieyes
e727a75f49 Merge pull request #6936 from VOREStation/aro-gunpods 
Small mech tweaks, adds gunpods
 2020-03-21 00:56:25 -04:00
Aronai Sieyes
106095365f Merge pull request #6932 from VOREStation/aro-maptips 
Add tooltips to visitable sectors on the overmap
 2020-03-21 00:56:13 -04:00
EllyBrown
b6d893db49 Changes to the custom item. (#6929) 
* Add files via upload

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm

* Update loadout_fluffitems_vr.dm

* Update loadout_fluffitems_vr.dm

* Update custom_clothes_vr.dm

* Update custom_clothes_vr.dm
 2020-03-21 00:55:55 -04:00
Aronai Sieyes
4aaff0704e Merge pull request #6925 from ShadowLarkens/vore_cleanup_less_cursed_maybe 
Cleanup vore code
 2020-03-21 00:52:46 -04:00
Aronai Sieyes
7cb680ab34 Merge pull request #6918 from VOREStation/upstream-merge-6826 
[MIRROR] Port Landmark Shuttles
 2020-03-21 00:52:08 -04:00
Unknown
80e5344901 Fixes Fennec/Xenohybrid hairstyles 2020-03-20 20:44:41 -04:00
Aronai Sieyes
d25e67ee56 Small mech tweaks 2020-03-20 19:49:11 -04:00
Atermonera
d397c2c1fe Merge pull request #6840 from Neerti/qol_notification_sounds 
QoL: Various Notifications
 2020-03-20 15:09:47 -04:00
Aronai Sieyes
c994134b23 Add tooltips to visitable sectors on the overmap 2020-03-20 14:19:54 -04:00
Unknown
db87175163 Earlyport Fixes 2020-03-20 13:50:44 -04:00
Novacat
edd4a0047d Merge pull request #6924 from Novacat/nova-shuttle 
Shield Generator for Cruiser
 2020-03-20 00:45:34 -04:00
Novacat
ac35542197 Merge pull request #6919 from VOREStation/aro-apcrevert 
Remove vorestation edit for APC sprite
 2020-03-20 00:43:33 -04:00
Novacat
aacc6e0869 Merge pull request #6826 from TheFurryFeline/patch-19 
Boostage Mk 3
 2020-03-20 00:43:13 -04:00
Novacat
697bcaaa66 Merge pull request #6746 from Sebbe9123/NIFnotnerfbad 
Buffs bioadaptive NIF to 75 durability
 2020-03-20 00:40:22 -04:00
Unknown
a40df7dda7 Earlyports some bugfixes 2020-03-20 00:35:55 -04:00
ShadowLarkens
d5d5385b76 Cleanup vore code 2020-03-19 21:17:24 -07:00
Novacat
59f30b2225 Update nif.dm 2020-03-19 22:23:46 -04:00
Leshana
41aa31f847 Refactor carp event to optionally use landmarks if present and stop at the edge of space. 2020-03-19 20:29:43 -04:00
Leshana
c8129e24fb Restrict dust, meteors and space carp events to space z-levels only. 2020-03-19 20:29:43 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12 
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
 2020-03-19 20:29:43 -04:00
Leshana
143ca9d981 Fixes and additional mapping convenience for landmark shuttles. 
- Improvement to web-shuttle: Don't update docking controller until jump() is completed.
  - It is now consistent with autodock behavior (for better or worse)
- Add shuttle process_state to enable processing of web shuttle autopilot.
- Convert Arrivals shuttles to be a subtype of /datum/shuttle/autodock/ferry
- Default shuttle landmarks flags to SLANDMARK_FLAG_AUTOSET
  - Made this safe and backwards compatible by having SLANDMARK_FLAG_AUTOSET not overwrite already specified base_turf or base_area
 2020-03-19 20:23:04 -04:00
Novacat
4cd077019f Merge pull request #6683 from Novacat/nova-heterochromia 
Species consolidation
 2020-03-19 18:55:54 -04:00
Aronai Sieyes
f946ee065e Remove vorestation edit for APC sprite 2020-03-19 18:44:14 -04:00
Aronai Sieyes
935b2baca5 Merge pull request #6914 from VOREStation/aro-mapload 
Speed up map load significantly
 2020-03-19 18:20:51 -04:00
Amaya
ea7db54500 Adds a single event mob. 
This mob will be very useful in events that I will be making.
Includes folder for non-Vore sprites (imported from TGstation)
 2020-03-19 14:12:36 +01:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Cerebulon
ef5f66184d Sound port sprite fixes (#6869) 2020-03-19 00:14:23 -04:00
Aronai Sieyes
32b68a17c6 Merge pull request #6903 from VOREStation/aro-miscchanges 
Move most antag things to admin-loadable maps
 2020-03-18 11:52:26 -04:00
Aronai Sieyes
fc581e151f Merge pull request #6907 from VOREStation/upstream-merge-6773 
[MIRROR] Cutting rigs now retracts all components, to stop the dreaded pseudoprison.
 2020-03-18 09:58:04 -04:00
Novacat
01b54f0952 Update rig.dm 2020-03-18 09:22:16 -04:00
Novacat
ae63f7b091 Merge pull request #6905 from VOREStation/upstream-merge-6853 
[MIRROR] Makes holsters and webbing get along.
 2020-03-18 09:21:43 -04:00
Atermonera
735f3a9e4a Cutting rigs now retracts all components, to stop the dreaded pseudoprison. 2020-03-18 04:11:32 -04:00
Atermonera
f28dcdb2d4 Merge pull request #6855 from Schnayy/newterrain 
POI wall nonsense
 2020-03-18 04:10:18 -04:00
Atermonera
20a9f6463b Merge pull request #6853 from Neerti/holsters_and_webbing 
Makes holsters and webbing get along.
 2020-03-18 03:31:49 -04:00
Aronai Sieyes
458212ac29 Correctly create circulation cus cats can't cope 2020-03-18 02:06:28 -04:00
Unknown
910f52f048 Skrell/Human helmet compatibility fixed 
Humans can wear Skrell helmets, but not vice versa
 2020-03-17 16:31:19 -04:00
Unknown
a53af26861 Code cleanup 2020-03-17 15:50:45 -04:00
Andrew
f043c8e42e Helmet Camera Verb No Longer Shows Without Helmet Camera (#6856) 
Changes the toggle helmet camera verb to a proc

Adds a check in the initialization of spacesuit helmets to see if it has a camera network.

Removes said check from the proc itself.

Basically this means you won't get the toggle-camera verb if you don't have one on your helmet.
 2020-03-17 15:47:46 -04:00
Unknown
ac2e5b8d03 Fixes Occupation Screen 2020-03-17 15:28:40 -04:00
Unknown
3fa51ef684 Tweaks voidsuit fitting 2020-03-17 15:04:11 -04:00
Unknown
c960a9ec30 Finishes this PR 2020-03-17 14:00:02 -04:00
Unknown
a6a12b3a9e Merge remote-tracking branch 'VOREStation/master' into nova-heterochromia 2020-03-17 13:16:11 -04:00
Novacat
e19a1fd2b9 Merge pull request #6892 from VOREStation/upstream-merge-6819 
[MIRROR] Makes language keys case sensitive, adds unit tests for language conflicts, fixes some language conflicts
 2020-03-17 01:40:47 -04:00
Unknown
a0d1e784c7 More duplicates 2020-03-17 01:25:43 -04:00
Novacat
fb33bde693 Merge pull request #6896 from VOREStation/upstream-merge-6834 
[MIRROR] Fix various RIG issues
 2020-03-17 01:15:18 -04:00
Unknown
62e6874e9b Fixes duplicate language keys 2020-03-17 01:12:31 -04:00
Atermonera
cd10c54d5c Merge pull request #6834 from Mechoid/RIGFixes 
Fix various RIG issues
 2020-03-17 01:06:31 -04:00