cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,819 Commits 9 Branches 0 Tags
00b148dd93752a462264c886bd7bd211e7415477
Commit Graph

36618 Commits

Author SHA1 Message Date
Novacat
00b148dd93 Merge pull request #6993 from VOREStation/upstream-merge-6896 
[MIRROR] Repaths collapsible white canes to not anger beepsky
 2020-03-25 16:53:36 -04:00
Novacat
b3dcc5cdc4 Merge pull request #6992 from VOREStation/upstream-merge-6897 
[MIRROR] Silly admins can't blindly break movement irreparably
 2020-03-25 16:53:26 -04:00
Novacat
850d637ffd Merge pull request #6991 from VOREStation/upstream-merge-6893 
[MIRROR] Berserkjuice doesn't spam chat
 2020-03-25 16:53:16 -04:00
Atermonera
027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
Atermonera
15e3ef676b Silly admins can't blindly break movement irreparably (#6897) 
* Silly admins can't blindly break movement

* Updates pixel movement var protections
 2020-03-25 16:39:06 -04:00
Atermonera
baf867e93d Besrserkjuice doesn't spam chat (#6893) 2020-03-25 16:37:53 -04:00
Atermonera
f6d626db67 Fix runtime in sound.dm: playsound(): source is an area (#6895) 2020-03-25 16:37:41 -04:00
Leshana
96a3242c6e Remove temporary debug logging from SStimer 2020-03-25 00:18:19 -04:00
Novacat
15bdd59852 Merge pull request #6982 from VOREStation/upstream-merge-6854 
[MIRROR] Xenoarch Expansion
 2020-03-24 22:57:12 -04:00
Novacat
096270f7ab Merge pull request #6983 from VOREStation/events-removing-skybox 
Quick fix to ensure events with skyboxes remove them at the end.
 2020-03-24 22:57:03 -04:00
Shadow-Quill
463b41cd06 Grammar 2020-03-24 21:42:01 -05:00
Leshana
9d335cf678 Quick fix to ensure events with skyboxes remove them at the end. 2020-03-24 22:16:48 -04:00
Novacat
f60096634e Update ano_device_battery.dm 2020-03-24 21:45:09 -04:00
Atermonera
4384ca1727 Xenoarch Expansion 2020-03-24 21:43:27 -04:00
Novacat
ab54382995 Merge pull request #6980 from VOREStation/aro-dust 
Fix dust zlevel choice
 2020-03-24 21:10:32 -04:00
Aronai Sieyes
ac419404cb Fix Dust level choice 2020-03-24 20:51:12 -04:00
Atermonera
6c94faa167 Makes Travis fail PRs that runtime during init/unit testing. 2020-03-24 17:29:09 -04:00
Novacat
94d61d1568 Merge pull request #6974 from VOREStation/aro-fightermerge 
Missed a color check on gunpods for paint
 2020-03-24 17:07:52 -04:00
Aronai Sieyes
53e8fbff40 Missed a color check in colorable gunpods 2020-03-24 16:34:55 -04:00
Novacat
b6e26ea163 Merge pull request #6953 from TheFurryFeline/TFF-Attack_Verb_Grammar_Fixy_Again 
[Oversight] Mob Attacktext Fixy
 2020-03-24 16:34:39 -04:00
Aronai Sieyes
2ea1802f68 Shove APCs and air alarms up on the wall a bit higher 2020-03-24 15:37:39 -04:00
Aronai Sieyes
74a2db19a3 Merge pull request #6970 from VOREStation/aro-fightermerge 
Fighter rename, aro.dmm rearrange
 2020-03-24 15:13:46 -04:00
Aronai Sieyes
6ebc236649 Merge pull request #6969 from VOREStation/revert-6968-upstream-merge-6882 
Redo "[MIRROR] Machinery: Always use update_use_power()"
 2020-03-24 15:09:21 -04:00
Leshana
5f9ec463c3 VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var. 2020-03-24 14:40:54 -04:00
Atermonera
febb374443 Merge pull request #6882 from VOREStation/vplk-machinery-use-power 
Machinery: Always use update_use_power()
 2020-03-24 14:40:53 -04:00
Aronai Sieyes
949b2db85b Rename fighter files 2020-03-24 14:26:46 -04:00
Aronai Sieyes
9917826c85 Merge pull request #6965 from VOREStation/aro-fighters 
Creates 2 new mech equipments and space fighters
 2020-03-24 14:04:42 -04:00
Leshana
56f9e6b9dc Revert "[MIRROR] Machinery: Always use update_use_power()" 2020-03-24 13:34:51 -04:00
Novacat
9dc324dbb3 Update autocloner.dm 2020-03-24 00:23:45 -04:00
Novacat
a78771b30a Update floor_light.dm 2020-03-24 00:17:41 -04:00
Unknown
609ed664db Reverts unmarked vorestation edits 2020-03-24 00:10:50 -04:00
Novacat
eeea91ccf0 Update and rename air_alarm.dm to alarm.dm 2020-03-23 23:55:52 -04:00
Novacat
022eb6e7de Update scrubber.dm 2020-03-23 23:33:44 -04:00
Novacat
4b2b3b3a2f Merge branch 'master' into upstream-merge-6882 2020-03-23 23:25:26 -04:00
Novacat
94f5eda84c Merge pull request #6967 from VOREStation/upstream-merge-6881 
[MIRROR] Add mob/living stat setter and observer
 2020-03-23 23:25:02 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
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
Aronai Sieyes
0efdb264fd VS Fighter framework with 5 fighters 2020-03-23 21:34:32 -04:00
Aronai Sieyes
78bbf215e9 Clean up various mech code and allow overrides lower 2020-03-23 21:34:32 -04:00
Aronai Sieyes
36ee762c1a Mecha cloaking generator 2020-03-23 21:34:32 -04:00
Aronai Sieyes
3a0cbdb1b1 Mecha omni-shield generator 2020-03-23 21:34:32 -04:00
Aronai Sieyes
1c38bd11ca VR Cloaking framework 2020-03-23 21:34:32 -04:00
Aronai Sieyes
c93c5afefa Adds atom/movable cloaking framework 2020-03-23 21:34:32 -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
Novacat
ba571acffc Merge branch 'master' into TFF-Attack_Verb_Grammar_Fixy_Again 2020-03-23 18:52:43 -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
TheFurryFeline
5c8ac8ccd1 Bitten to Bit 
Sync with Polaris version per review.
 2020-03-23 00:35:22 -04:00