cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 04:07:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,149 Commits 10 Branches 0 Tags
8564db46436393da71012ba7df8167b52f765a35
Commit Graph
26149 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuhayr 8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
PsiOmegaDelta 196add63ee Merge pull request #10788 from Zuhayr/voxtweaks 
Vox Pariah tweaks
 2015-08-21 19:33:19 +02:00
Zuhayr f752813132 Changelog. 2015-08-22 02:57:13 +09:30
Zuhayr eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +09:30
Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr 8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
GinjaNinja32 ae8fb3618f Merge pull request #10785 from PsiOmegaDelta/150821-MedAccess 
Gives the medical equipment access a name.
 2015-08-21 16:15:34 +01:00
PsiOmegaDelta 742dde5c25 Gives the medical equipment access a name. 
Requires for guest passes to list the entry. Fixes  #10780.
 2015-08-21 14:01:29 +02:00
mwerezak 4ac350cbbf Merge pull request #10781 from GinjaNinja32/status 
add round duration to status reply
 2015-08-21 01:52:10 -04:00
GinjaNinja32 c2cdf9d237 add round duration to status reply 2015-08-21 06:28:44 +01:00
Zuhayr 968a9d0f59 Merge pull request #10770 from PsiOmegaDelta/150820-SyndiShuttleAccess 
Fixes mercenaries having lost access to their own shuttle airlock.
 2015-08-20 19:18:21 +09:30
PsiOmegaDelta 3e4959045b Fixes mercenaries having lost access to their own shuttle airlock. 2015-08-20 10:00:23 +02:00
Chinsky ee91550445 Merge pull request #10741 from PsiOmegaDelta/150818-PleaseStop 
More Hurt to Harm
 2015-08-19 02:46:16 +03:00
PsiOmega 226b855394 More Hurt2Harm 
Make it stop q_q
 2015-08-18 22:44:13 +02:00
PsiOmegaDelta 438815f0db Merge pull request #10740 from Kearel/heistFix 
Fixes #10722
 2015-08-18 22:44:06 +02:00
Kearel f6b6a054c5 add medic helmet 2015-08-18 13:59:25 -05:00
GinjaNinja32 f950ded9af Merge pull request #10737 from PsiOmegaDelta/150818-RealFunny 
Another Hurt/Harm fix.
 2015-08-18 18:52:09 +01:00
GinjaNinja32 9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3 
Fixes #10723
 2015-08-18 18:51:37 +01:00
PsiOmega 0d10d53b65 Another Hurt/Harm fix. 
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
 2015-08-18 18:41:24 +02:00
Zuhayr b6ba94b256 Merge pull request #10728 from PsiOmegaDelta/150818-FakeWood 
Replaces fake wood floor in the bar with real wood floor.
 2015-08-18 23:59:53 +09:30
mwerezak b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
PsiOmegaDelta 1e96c2e7ff Merge pull request #10731 from Kelenius/ketchup 
Fixes #10730
 2015-08-18 15:15:23 +02:00
Kelenius cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
GinjaNinja32 05b94444ea Merge pull request #10726 from Kelenius/mobCleanup 
Minor mob cleanup
 2015-08-18 11:37:03 +01:00
Zuhayr 0b44a64104 Merge pull request #10724 from mwerezak/skipjack2 
Fixes #10680
 2015-08-18 18:18:55 +09:30
PsiOmegaDelta cf9f9bf019 Replaces fake wood floor in the bar with real wood floor. 
Fixes #10721.
 2015-08-18 10:33:18 +02:00
Kelenius afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
mwerezak 7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
Zuhayr f2b2f2a22c Merge pull request #10711 from PsiOmegaDelta/150817-RandomShuttles 
Admin level doors are now always of the secure variant.
 2015-08-17 19:02:20 -07:00
Zuhayr b6e7d33f3d Merge pull request #10715 from GinjaNinja32/irc 
Adds settable rank to IRC messages, changes it so non-admins can see …
 2015-08-17 18:51:53 -07:00
Zuhayr 5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode 
Gamemode fixes
 2015-08-17 18:50:58 -07:00
mwerezak 87da0d4eb5 Fixes missing ), "spam" class 2015-08-17 21:24:59 -04:00
GinjaNinja32 f0c8db3d0f Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs 2015-08-18 02:16:50 +01:00
mwerezak 3ea5bfb131 Makes error message print to admins instead of world 2015-08-17 21:12:40 -04:00
mwerezak e84f693219 Fixes certain antag roles from being unspawnable 
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
 2015-08-17 21:11:57 -04:00
mwerezak dadc6e4b77 Adds logging for admin spawning antags 2015-08-17 21:10:24 -04:00
mwerezak e1f4551693 Fixes revs being unspawnable 
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
 2015-08-17 21:04:23 -04:00
mwerezak ef8e3a94a0 Fixes antag datum not respecting restricted_jobs depending on config 
Fixes #10657
 2015-08-17 21:00:22 -04:00
PsiOmega 439b976272 Admin level doors are now always of the secure variant. 
Players keep finding ways to surprise.
 2015-08-17 22:41:19 +02:00
Chinsky a4550dd957 Merge pull request #10699 from PsiOmegaDelta/150817-Robofite 
Harm icon state consistency.
 2015-08-17 20:32:41 +03:00
GinjaNinja32 e596d3bdd6 Merge pull request #10681 from mwerezak/lighting 
Ports fix for #10660
 2015-08-17 14:17:53 +01:00
Zuhayr b9c95148fd Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment 
fix access artifacts from #9263
 2015-08-17 04:06:06 -07:00
Zuhayr 0e6a184f10 Merge pull request #10703 from GinjaNinja32/cryostorage 
adds admin logs to cryostorage
 2015-08-17 04:05:46 -07:00
GinjaNinja32 7bdbb72731 Change all misc research doors and windoors to require one of access_tox or access_robotics, rather than only access_tox or access_research 2015-08-17 11:51:05 +01:00
GinjaNinja32 0c8a2b16e0 adds admin logs to cryostorage 2015-08-17 11:34:26 +01:00
Zuhayr b27811ee07 Merge pull request #10700 from GinjaNinja32/locket 
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
 2015-08-17 03:04:42 -07:00
GinjaNinja32 4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
PsiOmegaDelta edebf946d8 Harm icon state consistency. 
All icon states relating to the I_HARM intent now all use the same naming convention.
 2015-08-17 10:16:39 +02:00
PsiOmegaDelta b062b59200 Merge pull request #10696 from PsiOmegaDelta/master 
Updates changelog.
 2015-08-17 09:36:04 +02:00
PsiOmegaDelta 3f1a974ac8 Updates changelog. 2015-08-17 09:31:33 +02:00