cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 07:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,846 Commits 7 Branches 0 Tags
bf31ccfd49df3b2d5c88e1c04661cce743d2c83b
Commit Graph

36634 Commits

Author SHA1 Message Date
Aronai Sieyes
bf31ccfd49 Merge pull request #7006 from VOREStation/aro-moreanounce 
Remove the 'has cleared the' announcement for ships
 2020-03-26 15:59:51 -04:00
Aronai Sieyes
710857ddd9 Same for dust 2020-03-26 12:41:01 -04:00
Aronai Sieyes
bb1494dfe3 Remove the 'has cleared the' announcement for ships 2020-03-26 11:55:40 -04:00
Aronai Sieyes
e618f8d16d Redo morph TF code 2020-03-26 11:20:50 -04:00
Novacat
0ab0c1752f Merge pull request #6997 from Meghan-Rossi/timeclockfix 
Fix: going on duty not giving correct access
 2020-03-26 00:25:53 -04:00
Meghan-Rossi
eec914cf3a Refactor: don't list all open jobs just to check 1 job is open 
Splits out the logic for checking if a job is available from the logic for listing all available jobs, so that when clocking someone in we can just check that the job is available instead of building the whole list of available jobs just to check that the job we're switching them to is still available.
 2020-03-26 03:32:01 +00:00
Meghan-Rossi
eecd6f6e99 Refactor: check that there's a card in the timeclock once, not 3 times 
checkFace() already checks that the card is still in the timeclock.  This commit removes two extra, unnecessary checks of this when clocking in or out.
 2020-03-26 03:31:28 +00:00
Meghan-Rossi
a129a3fe16 Fix: only being able to go on-duty as a job's main title 
We need to know the jobs main title to look up the access.  Tweaks the ui to keep track of it
 2020-03-26 03:31:01 +00:00
Meghan-Rossi
6df3d45b53 Fix: going on duty not giving correct access 
Currently going on duty gives you the access of the off duty job you already have, instead of looking up the job you're switching to and giving you access for that.  This fixes that.
 2020-03-26 02:56:59 +00:00
Atermonera
8e5e83c2b5 Prometheans can be slipped again (#6898) 
* Prometheans can be slipped again

* Update human_attackhand.dm
 2020-03-25 20:59:57 -04:00
Novacat
3e8128c917 Merge pull request #6994 from VOREStation/upstream-merge-6885 
[MIRROR] [Feature Tweak] Message Fixy For Snowballs/Kickstands
 2020-03-25 19:22:39 -04:00
Novacat
a765098a46 Merge pull request #6989 from VOREStation/upstream-merge-6892 
[MIRROR] Distillery tweaks
 2020-03-25 19:22:23 -04:00
Atermonera
f4fb9ac262 Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands 
[Feature Tweak] Message Fixy For Snowballs/Kickstands
 2020-03-25 18:47:34 -04:00
Novacat
f9bfa6e56d Merge pull request #6987 from Novacat/nova-basicfixes 
Fixes lurkers having super cloak
 2020-03-25 16:53:51 -04:00
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
Atermonera
6da6c7b1a5 Distillery tweaks (#6892) 
* Basic distillery uses logistic temp change
Basic distillery pings when at temp
Industrial distillery repsects gas laws

* Expands examine text to be informative
Adds verbs to distillery

* Tweaks distillery costs
 2020-03-25 16:36:26 -04:00
Unknown
a60d494a70 Fixes lurkers having super cloak 2020-03-25 16:02:38 -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