cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,547 Commits 8 Branches 0 Tags
c59dc2445c20eab49d8880de94d88dc361e13c04
Commit Graph

11606 Commits

Author SHA1 Message Date
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
Zuhayr
da3ee37df9 Merge pull request #9638 from PsiOmegaDelta/150602-LawSets 
Allows all synths to view the alternative law sets.
 2015-06-03 04:00:11 +09:30
GinjaNinja32
24adb8eb42 Fixes vine/infestation events not working with new lighting 
Also adds a helper for finding whether there are any simulated atoms on a turf
 2015-06-02 16:56:10 +01:00
Chinsky
886462c100 Merge pull request #9637 from PsiOmegaDelta/150602-LessRightClicking-Master 
Reduction of admin right-click verbs.
 2015-06-02 16:53:56 +03:00
PsiOmegaDelta
1a74b536d7 Active role counting tweak. 
The number of Any players now properly respects activity.
Borgs should now properly increase the number of players for a given job.
 2015-06-02 15:46:01 +02:00
GinjaNinja32
9ecde8f2a7 Merge pull request #9633 from comma/dev-freeze 
Couple fixes
 2015-06-02 14:37:07 +01:00
PsiOmegaDelta
3f26eeac99 Allows all synths to view the alternative law sets. 
This does not include laws such as the syndicate, spider clan, etc. laws.
Makes it less of a headache for a synth to state the standard NT laws while subverted, etc.
 2015-06-02 14:48:08 +02:00
PsiOmegaDelta
fcb0841646 Reduction of admin right-click verbs. 
Removes verbs which only works on specific mob types from the admin right-click context.
Fixes #9627.
Fixes #9628.
 2015-06-02 14:20:14 +02:00
PsiOmegaDelta
4a69d0a4f7 More MayRespawn checks. 
Astral projecting wizards/cultists may no longer respawn as something else.
 2015-06-02 13:40:53 +02:00
PsiOmegaDelta
4a976e1ee2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-02 13:13:40 +02:00
Chinsky
28c8cd1d81 Fixes #9623 
Also added a nullcheck for icons to prevent potential client crash.
 2015-06-02 13:13:44 +03:00
PsiOmegaDelta
e70faa20ee Merge pull request #9629 from GinjaNinja32/spawn 
Spawn fixes
 2015-06-02 08:05:54 +02:00
GinjaNinja32
5ebece6368 Spawn fixes 
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
 2015-06-02 02:24:32 +01:00
Chinsky
26167895b5 Merge pull request #9621 from PsiOmegaDelta/150601-Adminhelp 
Admin PM replies now sent to IRC.
 2015-06-01 21:08:22 +03:00
PsiOmega
0aade86d5f Admin PM replies now sent to IRC. 
Now both ahelps and their replies should be sent to an IRC channel, if configured.
 2015-06-01 19:43:54 +02:00