cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,372 Commits 5 Branches 0 Tags
f54dd94a66e5d94975d0b51ec20655c5e165ca22
Commit Graph

10604 Commits

Author SHA1 Message Date
PsiOmegaDelta
d7eaed8c67 Span correction. 2015-12-22 10:59:33 +01:00
PsiOmegaDelta
3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-12-22 10:46:55 +01:00
GinjaNinja32
ae7f59a23f Merge pull request #11725 from Ccomp5950/stumpy 
Stumpy hands and arms can no longer pull stuff out of bags and such.
 2015-12-22 03:00:21 +00:00
ccomp5950
fe62634775 Stumpy hands and arms can no longer pull stuff out of bags and such. 
Resolves #11404
 2015-12-21 17:56:30 -05:00
ccomp5950
d574d60e26 Canisters now work in unpowered areas. 2015-12-21 15:00:25 -05:00
PsiOmegaDelta
c78f98754a Utensils now respect the lack of mouths, and has a delay on feeding others. 2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
Chinsky
4a0d121f25 Merge pull request #11702 from PsiOmegaDelta/151217-PolarFixesMaster 
No verbose cantouch check when not climbable
 2015-12-19 03:13:45 +03:00
Loganbacca
07e81c059c Fixed bullets traveling diagonally through windows 
- Fixes #11465
 2015-12-18 20:12:46 +13:00
Hubblenaut
dc2ad43dc5 No verbose cantouch check when not climbable 2015-12-17 17:44:04 +01:00
Spamcat
905070bc96 \the 2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318 \red >> styles 2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45 Made kitchen utensils less dangerous. 
#11370
 2015-12-16 20:07:35 +03:00
Spamcat
f2ac9a023b pAIs no longer see custom emotes twice. 
fuck i spent way too much time on a single line fix
 2015-12-16 19:36:14 +03:00
PsiOmegaDelta
a2d2a092c5 All the macros. 2015-12-13 15:19:14 +01:00
Dibasic
1e06889ef1 Fixes window 'bang' typo 
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
 2015-12-13 15:06:14 +01:00
PsiOmegaDelta
b31a5ba836 Compilation fixes. 2015-12-13 10:21:00 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
SkyMarshal
415f78ee18 Chem grenades are no longer melted by acid. 
Fixes #10478
 2015-12-12 16:29:05 -07:00
Chinsky
0a4ebb2765 Fixes #10751 Thrown items now use last_move direction isntead of neverchanging dir 2015-12-12 15:29:08 +03:00
PsiOmegaDelta
db9615f94d Merge pull request #11672 from comma/tooreal 
Fixes #9091
 2015-12-12 12:47:07 +01:00
Chinsky
8940705921 Fixes #9091 2015-12-12 14:40:51 +03:00
Chinsky
37a93231d6 Fixes #8741 2015-12-12 14:09:59 +03:00
Atlantis
b13e445b40 Fixes #11456 
- Fixes #11456 by using wires.Interact() rather than current method.
 2015-12-11 13:29:42 +01:00
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master 
Dev-freeze
 2015-12-10 08:21:43 +01:00
Zuhayr
7a9d7bf0c9 Fixes #10753 2015-12-10 10:41:48 +10:30
Zuhayr
f1630108db Fixes #10915 2015-12-10 10:32:35 +10:30
Hubblenaut
706e12e9ab Camera Hotfix 2015-12-09 09:03:01 +01:00
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
BlueNexus
908ae91a08 Can no longer enter mechs while buckled 2015-12-07 11:17:12 +00:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
9d0e13b977 Merge pull request #11608 from mwerezak/soap-fix 
Fixes runtime when cleaning turfs with soap
 2015-12-07 09:42:33 +01:00
HarpyEagle
93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -05:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
6688fc49fb Adds logging for regular suicide 2015-12-06 02:43:50 -05:00
mwerezak
87648e86ef Fixes runtime when cleaning turfs with soap 
Partial fix of #11490
 2015-12-06 02:00:50 -05:00
mwerezak
b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
PsiOmegaDelta
da080df765 Fixes records unintentionally referencing each other. 
Because of the limitations of BYOND's bitwise operators (which affect both the old and new implementations of num2hex()), you cannot use numbers larger than 2^16 with that proc.
Manual port of https://github.com/PolarisSS13/Polaris/pull/430.
 2015-12-05 09:25:56 +01:00
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
NullSnapshot
c946ca7468 cleaning up recharge station's go_in proc by implementing a helper. 2015-12-04 00:05:00 -08:00
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Zuhayr
1ffb2098bc Merge pull request #11565 from atlantiscze/02-12-2015-closet_explosions 
Fixes #11540
 2015-12-02 21:11:26 +10:30
Atlantis
89f5c9f405 Fixes #11540 2015-12-02 11:27:28 +01:00
GinjaNinja32
aa4820411f Merge pull request #11554 from Hubblenaut/master 
Fixes camera repair
 2015-12-02 10:14:43 +00:00
PsiOmegaDelta
11e47bc8c2 Fixes being unable to emag secure closets. 
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
 2015-12-02 08:30:47 +01:00
Hubblenaut
44cb040e54 Fixes camera repair 2015-12-01 17:43:34 +01:00
PsiOmegaDelta
5a0d76d876 Merge pull request #11548 from Baystation12/master 
Dev-freeze
 2015-12-01 08:09:15 +01:00