cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 8 Branches 0 Tags
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

11520 Commits

Author SHA1 Message Date
PsiOmega
581c9b1308 Fixes admin jumps. 
Changes the checks and message target around, now targets usr instead of src.
 2015-06-09 20:14:05 +02:00
PsiOmega
3591bd5599 Travis now builds using version 508.1287 
throw is now a keyword. Updates usages where necessary to allow compilation.
 2015-06-09 15:36:27 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmegaDelta
ec68454f63 Fixes #9753. 
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
 2015-06-09 08:55:12 +02:00
GinjaNinja32
54b531c36e Merge pull request #9743 from Techhead0/voidsuitTweaks 
Minor tweaks to voidsuits.
 2015-06-09 02:51:24 +01:00
PsiOmega
13cb32fa7f Another MayRespawn() fix. 
Being unable to reenter your body now allows you to respawn, even if your body lives.
 2015-06-08 17:39:25 +02:00
Zuhayr
389178a9ad Merge pull request #9745 from Kelenius/ofReagentsAndOD 
Fixes #9738 - reagents always overdose
 2015-06-08 20:43:55 +09:30
Kelenius
37f02ebc93 Fixes #9738 - reagents always overdose 2015-06-08 12:41:58 +03:00
Techhead0
f2f34b9a38 Minor tweaks to voidsuits. 
Component removal uses a dialogue box instead of removing items in a set order.
Renames "Eject Tank" to avoid duplicate verb names.
Changes order of components when equipping voidsuits.
Two user message changes.
 2015-06-08 05:30:11 -04:00
GinjaNinja32
d6677d4389 Merge pull request #9739 from PsiOmegaDelta/150608-NoPowerNoControl 
AI restrictions and rejuvenation.
 2015-06-08 10:08:55 +01:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master 
Dev-freeze
 2015-06-08 09:56:24 +02:00
PsiOmegaDelta
cad9b59c25 AI restrictions and rejuvenation. 
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
 2015-06-08 09:10:33 +02:00
zonthori
98ca5466e2 Straight base_state 2015-06-07 13:56:11 -06:00
zonthori
ccb01cd4ed Fixes https://github.com/Baystation12/Baystation12/issues/9728 
Fixes custom welding helmet sprites to break when toggled.

https://github.com/Baystation12/Baystation12/issues/9728
 2015-06-07 13:38:44 -06:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles. 
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
 2015-06-07 12:31:55 -04:00
Chinsky
bb824dba42 Merge pull request #9721 from atlantiscze/apcfix 
Refactors /obj/item/apc_frame to /obj/item/frame/apc
 2015-06-07 12:43:01 +03:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog 
Syringe gun logs, logging helper reorganization
 2015-06-07 09:00:21 +02:00
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn 
Fixes #9685.
 2015-06-07 15:06:09 +09:30
Atlantis
0135051498 Fixes #9706 
- Adds checks whether the turf exists. This should prevent runtimes.
- Moves ..() call in food/snacks/grown after seed.thrown_at() call. I believe this was causing the runtime in first place.
 2015-06-07 06:43:50 +02:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc 
- This fixes broken APC frame placement on walls - #9537
 2015-06-07 06:26:10 +02:00
Atlantis
bb33905803 Fixes minor typo in organ Destroy() 2015-06-07 05:29:43 +02:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze 
Fixes #9597
 2015-06-07 03:14:06 +01:00
Zuhayr
22bf5352a3 Merge pull request #9698 from PsiOmegaDelta/150605-ChockingLogs 
Fixes #9697
 2015-06-07 11:27:32 +09:30
mwerezak
f62cc38883 Adds logging for syringe_gun 
Also updates holder get_reagents() output formatting
 2015-06-06 17:02:42 -04:00
PsiOmegaDelta
c4ecf46a4c Merge pull request #9713 from mwerezak/gunlag 
Muzzle flash sets lighting instead of creating objs
 2015-06-06 21:19:11 +02:00
GinjaNinja32
5f75e3038e Merge pull request #9710 from atlantiscze/beyond-undestructible 
Fixes #9705
 2015-06-06 20:16:17 +01:00
mwerezak
15d82778cd Muzzle flash sets lighting instead of creating objs 
Shooting a gun no longer generates illumination objects
 2015-06-06 12:57:43 -04:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
Atlantis
265719b4aa Fixes #9705 
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
 2015-06-06 17:30:43 +02:00
PsiOmega
cbead4224b Fixes #9685. 
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
 2015-06-06 15:44:49 +02:00
Atlantis
8a5a969002 More Destroy()s, better implementation 
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
 2015-06-06 11:04:41 +02:00
Atlantis
b16bf61d03 Implements Destroy() for buildable SMES units. 
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
 2015-06-06 09:43:39 +02:00
Atlantis
69e0ebf71e Implements Destroy() for organs 
- This fixes annoying roundstart GC errors, and should fix other limb/organ related GC errors as well.
 2015-06-06 07:21:34 +02:00
Atlantis
f66e5c9c94 Fixes #9619 2015-06-06 06:52:42 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e Fixes a pair of null.z runtimes 
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
 2015-06-06 02:23:06 +01:00
PsiOmega
711eb0501c Fixes #9697 
Replaces and closes the <span>
 2015-06-05 21:17:11 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
Karolis2011
9ff27dc038 Now when welding sorting pipe, game update it's name 2015-06-04 20:48:57 +03:00
Dennok
05b4c97e1a fix #9666 
up
 2015-06-04 18:46:27 +03:00
PsiOmegaDelta
65fc980b20 Stack splitting and cable merging fixes. 
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
 2015-06-04 13:24:12 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
PsiOmega
086517f988 Closes a span class. 
Has somehow gone unnoticed until now.
 2015-06-03 17:57:57 +02:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes 
Fixes
 2015-06-03 11:45:45 +09:30
mwerezak
0777f9c998 Fixes #9648 
Robotic limbs are no longer able to mutate.
 2015-06-02 21:40:30 -04:00
Chinsky
807a92f6d7 Merge pull request #9647 from GinjaNinja32/eftpos 
Fixes #9645
 2015-06-02 22:42:48 +03:00
GinjaNinja32
5a2933bb4f Fixes #9645 2015-06-02 20:39:03 +01:00
Zuhayr
04d1b40e3d Merge pull request #9626 from GinjaNinja32/vine_event_fix 
Fixes vine/infestation events not working with new lighting
 2015-06-03 04:00:21 +09:30
Zuhayr
49e121bb7a Merge pull request #9630 from PsiOmegaDelta/150602-EventTweak 
Active role counting tweak.
 2015-06-03 04:00:17 +09:30