cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,694 Commits 6 Branches 0 Tags
65ac3d97d01e96bb5a0017f5bdfaa7c39c9effb4
Commit Graph

10061 Commits

Author SHA1 Message Date
Chinsky
1993935766 Fixes #9899 2015-07-09 23:17:06 +03:00
Null Snapshot
dcaa8289a1 Fix for missed if(A | B) else if (b) check. 2015-07-09 12:26:11 -07:00
Null Snapshot
a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight 
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-09 19:17:04 +01:00
Chinsky
c7d9ce4697 Merge pull request #10046 from mwerezak/custom-item-icons 
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
 2015-07-09 20:52:38 +03:00
Chinsky
7d9b7e10f4 Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations 
Reduced Hell Universe Lag
 2015-07-09 20:45:51 +03:00
Zuhayr
d047311931 Should fix #9895, hopefully. 2015-07-10 01:21:12 +09:30
Zuhayr
946c445b29 Fixes #9896 2015-07-10 01:14:12 +09:30
GinjaNinja32
f3d09e092e Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap 2015-07-09 16:25:47 +01:00
Zuhayr
20f93b6009 Fixes #9394 2015-07-10 00:21:17 +09:30
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights 
Lighting optimizations + NVG meson fix
 2015-07-09 14:50:10 +01:00
Zuhayr
d47c2c8a02 Fixes #10013 2015-07-09 04:05:40 +09:30
mwerezak
01104eda45 Fixes utensil force dividers. 
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
 2015-07-08 01:37:07 -04:00
PsiOmegaDelta
ed5a12c2a2 Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes" 2015-07-07 17:14:42 +02:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag 
Based on https://github.com/d3athrow/vgstation13/pull/5273.
 2015-07-07 12:55:39 +02:00
PsiOmegaDelta
62017e7af2 Merge pull request #10008 from mwerezak/custom-item-icons 
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
 2015-07-07 06:44:10 +02:00
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
Zuhayr
2129bf6c2e Merge pull request #10014 from mwerezak/raider-gear 
Fixes issues with equipping raiders, raider gun type
 2015-07-06 05:48:25 +09:30
Chinsky
c5eb043a46 Merge pull request #9998 from Kearel/trayFix 
Fixing Tray Bug
 2015-07-05 20:10:26 +03:00
mwerezak
1abb52532d Merge branch 'atmosfix' into airlockfix 2015-07-05 01:20:33 -04:00
mwerezak
c46f32e8d7 Airlock controller fixes 
Fixes airlocks opening their doors before the pumps have turned off.
Fixes airlocks getting confused if you mash buttons in quick succession.
 2015-07-04 23:49:54 -04:00
mwerezak
c1bbc5c3a6 Fixes issues with raider equipping 
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
 2015-07-04 16:32:35 -04:00
mwerezak
fad0a712d8 Expands raider gear list 2015-07-04 15:39:31 -04:00
PJB3005
aa30a12125 Fixes another bug 2015-07-04 17:55:41 +02:00
mwerezak
b7ee6e11fc Swaps force divisors between kitchen knives and utensil knives. 
Because why does the utensil deal more damage than a chopping knife?
 2015-07-03 22:02:28 -04:00
mwerezak
b2d3711c11 Fixes knife inhand states 2015-07-03 21:58:11 -04:00
Kearel
9a6391747d fix trays 
Puts pikcup proc before loc is changed.
 2015-07-02 13:55:27 -05:00
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
791b9eb27d Merge pull request #9981 from Zuhayr/antioxidant 
Removes the RUST engine.
 2015-07-01 08:31:14 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
PsiOmega
ba630d2556 Portable turret feedback changes. 2015-06-30 16:28:00 +02:00
PsiOmegaDelta
d827e41bdf Replaces the portable turrets on Crescent with the clean presets. 2015-06-30 15:51:26 +02:00
PsiOmegaDelta
a76c915e2e Adds missing changelog icon to the client pre-fetch. 2015-06-30 15:13:28 +02:00
PsiOmegaDelta
b7bdd4b583 Create Crescent/ERT portable turret presets. 2015-06-30 15:08:29 +02:00
PsiOmegaDelta
001d4839f1 Fixes missing assessment check. 2015-06-30 15:03:51 +02:00
PsiOmegaDelta
beaaaa9f8a Portable turrets are now (more or less) a single entity 2015-06-30 14:52:37 +02:00
PsiOmegaDelta
0624fced64 Compilation.. fix and ensuring the Thunderdome isn't a dark pit. 2015-06-30 08:46:32 +02:00
PsiOmegaDelta
cf10dc38b1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm
 2015-06-30 08:24:43 +02:00
GinjaNinja32
ebf037af5e Fixes an infinite loop issue 
Title. reset_view() called handle_regular_hud_updates() called check_eye() called reset_view() [...]
 2015-06-30 06:26:51 +01:00
Chinsky
3a391250a2 Merge pull request #9961 from PsiOmegaDelta/150628-DroneRuntime 
Fixes drone runtime.
 2015-06-29 22:48:37 +03:00
PsiOmega
7e33beab0f Fixes drone runtime. 
Spawning drones no longer cause runtimes. Fixes #9909.
 2015-06-28 19:02:23 +02:00
Chinsky
9cfd04f959 Merge pull request #9952 from mwerezak/camera-console-fix 
Fixes #7910
 2015-06-28 19:42:00 +03:00
PsiOmega
85d0d6fcd3 Wrenching times no longer runtime. 
Fixes #9175.
 2015-06-28 18:17:53 +02:00
mwerezak
4062f81f20 Fixes #7910 
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
 2015-06-28 11:59:19 -04:00
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
Chinsky
be24aa0272 Merge pull request #9935 from GinjaNinja32/irc_notification 
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
 2015-06-27 01:09:37 +03:00
Ravensdale
ba3d180db6 Remove posi-mmi-mechs 
fix

actual removal
 2015-06-26 12:37:37 -07:00
PsiOmega
6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
 2015-06-26 19:22:31 +02:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
Chinsky
ed779b7ff9 Merge pull request #9937 from mwerezak/master-fixes 
Fixes
 2015-06-26 09:19:48 +03:00