cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,746 Commits 8 Branches 0 Tags
1873a3a870b6f633c49811f270065512d07b45ce
Commit Graph

36572 Commits

Author SHA1 Message Date
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Aronai Sieyes
7dcfd12266 Merge pull request #6946 from VOREStation/aro-announce 
Don't announce overmap events
 2020-03-23 21:40:46 -04:00
TheFurryFeline
9cfabc32a7 New Message, No Votes Anymore 
Title.

Changelog Notes: 

- Changes the roundvote message into a warning that one hour is left of the shift.
 2020-03-23 19:11:16 -04:00
Aronai Sieyes
61bbf89144 Fix line endings 2020-03-23 10:37:19 -04:00
Atermonera
358d35b2aa [Oversight] Yay, another typo fixy 2020-03-23 02:34:24 -04:00
Atermonera
2ec545c42b Merge pull request #6883 from VOREStation/vplk-port-tickrate-change 
Safely change world.fps for SStimer
 2020-03-22 20:18:00 -04:00
Atermonera
b27990c5d0 Merge pull request #6870 from VOREStation/pol-aibash 
Makes AI give up bashing if nothing to bash
 2020-03-22 14:51:53 -04:00
Novacat
afa6aa785e Merge pull request #6951 from Novacat/nova-basicfixes 
Real Crash Fix
 2020-03-22 09:32:41 -04:00
Unknown
baa24b9838 Number of votes 2020-03-22 09:23:33 -04:00
Unknown
8e0bd119b2 Real Crash Fix 
Remind me never to code when dead tired
 2020-03-22 09:18:20 -04:00
Novacat
6c52239b6c Merge pull request #6947 from VOREStation/aro-combatdrone 
Combat drone sprite
 2020-03-22 09:17:42 -04:00
Runa Dacino
99b7377c5e Unwhitelists solcom 
Shouldn't be a whitelisted language, for some reason it was removed from vr exceptions. Readded.
 2020-03-22 05:36:54 +01:00
Unknown
004e3682a0 Emergency Crash Fix 2020-03-21 23:53:51 -04:00
Aronai Sieyes
033e64f3c9 Combat drone sprite 2020-03-21 21:20:50 -04:00
Aronai Sieyes
d8d7ebf99a Remove announcements from overmap events 2020-03-21 19:17:36 -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
Aronai Sieyes
04da57b5da Gunpod! 2020-03-20 19:48:38 -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
3c17ff054d Merge pull request #6920 from VOREStation/aro-airalarms 
Swap air alarm sprites
 2020-03-20 00:43:45 -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
Novacat
d9358f5828 Merge pull request #6890 from VOREStation/aro-framedirs 
Port Bay frame icons
 2020-03-20 00:40:03 -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
cf7d50978e Fix list_values to support lists of lists. Fix missing variable init. 2020-03-19 20:28:53 -04:00
Aronai Sieyes
b2ba1d43cf Swap air alarm sprites 2020-03-19 20:24:20 -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
15273a356c Merge pull request #6913 from Heroman3003/jobstuff 
Does some adjustment to _vr job things
 2020-03-19 19:00:25 -04:00
Novacat
31696e2873 Merge pull request #6909 from Novacat/nova-shuttle 
Updates NT Cruiser
 2020-03-19 18:56:19 -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
Leshana
81b7746617 Set initialized = FALSE on unsimulated turfs that need to intialize. 2020-03-19 17:56:55 -04:00
Aronai Sieyes
c6a95000df Most of area/New() to initialize 2020-03-19 15:51:05 -04:00