cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,837 Commits 9 Branches 0 Tags
d1fc12e1c70b3cd7cfddc31d324a18d75e06cf4b
Commit Graph

3557 Commits

Author SHA1 Message Date
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
GinjaNinja32
b4e6b4e204 Fixes not checking proximity argument 2014-08-13 09:41:38 +01:00
Walter0o
7aa7f1c56c getting rid of text macro 2014-08-12 02:24:37 +02:00
Walter0o
dd39fbe985 typo fix 2014-08-11 23:23:38 +02:00
Zuhayr
aa90ebb0c6 Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix 
Fixed the font tag on mouse traps description.
 2014-08-07 10:01:23 +09:30
Ccomp5950
74fd47e2de Fixed the font tag on mouse traps description. 2014-08-05 18:55:15 -05:00
Ccomp5950
52da372bac Fueltanks now log and admin_msg when shot at / weldered 2014-08-04 21:11:09 -05:00
Ccomp5950
4df46548ac Merge pull request #5896 from Glloyd/fixes 
Two Fixes
 2014-08-04 19:37:02 -05:00
Ccomp5950
f95074d17e Merge pull request #5887 from mwerezak/jetpack-icon 
Fixes #5852
 2014-08-04 15:17:02 -05:00
Graham Lloyd
2c30af6124 Fireaxe cabinet hacking now fails if player moves away 2014-08-04 14:53:33 -04:00
mwerezak
cf3a37d732 Fixes #5852 2014-08-03 12:32:37 -04:00
Walter0o
a586c1dd70 remove double paper/attack() definition 2014-08-03 13:52:47 +02:00
Whitellama
a36becad2b Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag) 2014-08-01 17:05:54 -07:00
Walter0o
df6ac58d84 fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
 2014-07-26 13:08:25 +02:00
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Zuhayr
6b51645283 Merge pull request #5704 from mwerezak/species-refit 
Fixes object icons not being updated when refitting hardsuits for different species
 2014-07-21 16:09:47 +09:30
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
mwerezak
789d3e4d54 Fixes modkits 
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
 2014-07-19 23:17:35 -04:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
mwerezak
f2845dbe76 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.
 2014-07-15 01:14:04 -04:00
Chinsky
d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix 
Changing URL of Corporate Regulations to the new Corporate Regulations
 2014-07-14 07:12:37 +04:00
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
DJSnapshot
743ac61155 Little Slip-up 2014-07-13 13:30:36 -07:00
DJSnapshot
5063178aa6 Changed URL to Corporate Regulations 2014-07-13 13:29:19 -07:00
Chinsky
4e371f7af7 Merge pull request #5585 from SparklySheep/patch-3 
Fuk da law
 2014-07-13 08:56:54 +04:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
SparklySheep
55c7fbe739 Changes Space Law book to Corporate Regulations 
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
 2014-07-12 10:26:54 -05:00
Ccomp5950
e44bcf81fe Merge pull request #5559 from Walter0o/deadly_fork_fix 
deadly sharp w_class 1 fix
 2014-07-10 23:40:25 -05:00
Zuhayr
0d21889bee Fixed some bugs, did some testing, moved some procs around for robot functionality. 2014-07-11 13:50:34 +09:30
Zuhayr
70ba371658 Merge resolution. 2014-07-11 12:47:16 +09:30
Walter0o
5289776e33 removes sharpness from forks 
too commonly available to enjoy the sharp bonus.
 2014-07-10 19:47:59 +02:00
DJSnapshot
eacd384d39 Merge pull request #5554 from Baystation12/master 
Updating dev with master
 2014-07-09 23:00:04 -07:00
Jim the Cactus
c984385adb Merge branch 'master' of https://github.com/baystation12/baystation12 2014-07-09 14:53:16 -06:00
Zuhayr
f477012ab8 Merge pull request #5533 from mwerezak/wound-infections 
Fix for #5532 and the last of the infection changes, I hope
 2014-07-09 19:28:00 +09:30
Mloc
c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master 
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
 2014-07-09 10:41:22 +01:00
mwerezak
910ce676b0 Fixes advanced trauma kits claiming to disinfect but not doing so 2014-07-08 18:49:51 -04:00
John-Michael O'Brien
0e1d549ff1 Update PDA.dm 
Patched the comment to match the actual, final behavior (Doh!)
 2014-07-07 22:57:37 -06:00
Hubblenaut
6f1759a7aa Fixes me being dumb with renaming variables 2014-07-08 03:07:22 +02:00
Hubblenaut
38ac5ece7c Health Analyzer can read all types of beneficial medicine 2014-07-08 02:09:53 +02:00
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-07-06 17:50:53 +01:00
JimTheCactus
da6ff0a251 Patched PDA scanner to be more useful 
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
 2014-07-05 19:55:23 -06:00
Zuhayr
21e625d89b Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 2014-07-05 16:48:59 +09:30
Zuhayr
34d19d16f5 Fffffff fixes crates not budging properly. 2014-07-05 04:17:12 +09:30
Zuhayr
67da4096b3 Fixes #5461 2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8 Fixes #5490 2014-07-04 17:39:45 +09:30