cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,681 Commits 5 Branches 0 Tags
616b4b60e4c8b6d1f6245aec2d24746f4bf0dc31
Commit Graph

19351 Commits

Author SHA1 Message Date
mwerezak
b2d3711c11 Fixes knife inhand states 2015-07-03 21:58:11 -04:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
PsiOmegaDelta
fb60cfde4c Rejuvenation now clears chemicals in mobs. 
Fixes #9921.
 2015-07-03 16:41:10 +02:00
Kearel
9a6391747d fix trays 
Puts pikcup proc before loc is changed.
 2015-07-02 13:55:27 -05:00
GinjaNinja32
88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket 
Fixes #9986.
 2015-07-02 13:55:27 +01:00
GinjaNinja32
a2e66b4095 Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix 
Speech impediment fixes.
 2015-07-02 13:54:16 +01:00
Zuhayr
2a32150658 Merge pull request #9992 from Baystation12/master 
Master into dev-freeze
 2015-07-02 19:00:00 +09:30
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
db1135169d Fixes #9986. 
A simple matter of a missing return line.
 2015-07-02 10:43:22 +02:00
PsiOmegaDelta
a98c4a2c8e Speech impediment fixes. 
Fixes #9987.
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
 2015-07-02 10:04:08 +02:00
Chinsky
42a1ad8b81 Merge pull request #9985 from GinjaNinja32/teleport 
Fixes the third teleportation effect
 2015-07-02 09:13:03 +03:00
GinjaNinja32
7b1d9a54be Fixes the third teleportation effect 
why isn't this a proc
 2015-07-02 06:36:30 +01:00
Chinsky
0b9d9167f7 Merge pull request #9980 from mwerezak/supermatter 
Fixes #9591
 2015-07-02 06:07:42 +03:00
PsiOmegaDelta
977ed13e14 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
 2015-07-01 22:35:00 +02:00
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
PJB3005
dcbfff8aaa Fixes stuck lights 2015-07-01 07:59:19 +02:00
mwerezak
5ec5fdeb46 Fixes #9591 
Adjusts supermatter radiation range and intensity
 2015-07-01 01:18:14 -04:00
PsiOmega
15c165f4e5 Fixes #7042. 
Fixes issues with the AI centering on its core whenever it's attached to machinery.
Previously fixed on dev-freeze.
 2015-06-30 20:09:10 +02:00
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
PsiOmegaDelta
b482c5c07d Merge pull request #9958 from GinjaNinja32/botfix 
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
 2015-06-28 12:48:54 +02:00
GinjaNinja32
9a9f8e5563 (probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly 2015-06-28 11:43:53 +01:00
PsiOmegaDelta
6a808e5394 Merge pull request #9956 from GinjaNinja32/time 
Changes time to never go higher than 23:59
 2015-06-28 09:17:14 +02:00
GinjaNinja32
9d57473eff changes time to never go higher than 23:59 2015-06-28 01:34:57 +01:00
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
3c3d6f3497 Un-breaks hats, semi-fixes #9873, partially reverts #9937 2015-06-27 08:59:27 +01:00
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
GinjaNinja32
61cd53e265 Merge pull request #9944 from Ravensdale/master 
Remove posi-mmi-mechs
 2015-06-26 21:31:02 +01:00
Ravensdale
ba3d180db6 Remove posi-mmi-mechs 
fix

actual removal
 2015-06-26 12:37:37 -07:00
GinjaNinja32
98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished 
Fixes #9929
 2015-06-26 19:24:24 +01: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
Atlantis
90f08d3fa7 Fixes #9929 
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
 2015-06-26 18:22:59 +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
mwerezak
c6c200c127 Fixes #9251 2015-06-26 01:38:04 -04:00
mwerezak
242f5c5dfd Fixes #9928 2015-06-26 01:35:35 -04:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00