cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,347 Commits 10 Branches 0 Tags
d0c2b883aada506a016b04746d6545fe08e3f05d
Commit Graph

18329 Commits

Author SHA1 Message Date
Chinsky
d0c2b883aa Merge pull request #9069 from RavingManiac/dev 
Muzzle-flash lighting effect for guns
 2015-05-06 17:27:21 +03:00
PsiOmega
e9b32cf26e Ensures drained_this_tick is actually set. 2015-05-06 12:30:05 +02:00
PsiOmega
72ffea6fd3 Attempts to ensure the powersink remains processed correctly, moves processing disconnection into Destroy(). 2015-05-06 12:25:50 +02:00
PsiOmega
78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm
 2015-05-06 12:19:50 +02:00
Zuhayr
df6ff69f01 Merge pull request #9103 from DeeUnderscore/fix-fabricators 
Fix mech fabricators not syncing
 2015-05-06 11:04:21 +09:00
ccomp5950
7436573177 Fixes the removal of all organs when admins use "Select Equipment" 
fixes #8884
 2015-05-05 21:37:28 -04:00
Atlantiscze
91e3ced65e Powersink Fix 
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of  1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
 2015-05-05 18:49:11 +02:00
Daranz
82b7af7fb5 Fix mech fabricators not syncing 
Fixes #9058.
 2015-05-05 11:42:05 -04:00
PsiOmega
1fc76bcb9b The examine tab now lists the available pen commands. 2015-05-05 09:03:43 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
 2015-05-05 08:11:28 +02:00
Chinsky
e0a903d9eb Merge pull request #9093 from Baystation12/master 
Master->Freeze
 2015-05-05 01:42:57 +03:00
Ccomp5950
4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos 
Fixes a few log-destroying lines
 2015-05-04 15:30:13 -04:00
PsiOmegaDelta
d1227bdec5 Merge pull request #9087 from volas/cinematic2 
Modification to 'cinematic' command
 2015-05-04 20:55:08 +02:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
Chinsky
8294f02c1b Merge pull request #9072 from PsiOmegaDelta/BrokenGrills 
Grilles and rod tweaks.
 2015-05-04 21:25:24 +03:00
Chinsky
3f03fea06e Merge pull request #9074 from RavingManiac/dev-2 
Explosion tweaks and fixes
 2015-05-04 21:25:12 +03:00
Chinsky
7f8c4b4d4d Merge pull request #9081 from Kelenius/ofChemAndFour 
Chemistry-Reagents: absolute paths and split
 2015-05-04 21:24:09 +03:00
Chinsky
587015ff4e Merge pull request #9086 from RavingManiac/master 
Intent menu appears on zoom
 2015-05-04 21:24:06 +03:00
PsiOmega
1edb39b556 Merge remote-tracking branch 'upstream/dev' into BrokenGrills 2015-05-04 14:58:24 +02:00
PsiOmega
6658f52ced Merge remote-tracking branch 'upstream/master' into dev 2015-05-04 14:56:15 +02:00
PsiOmegaDelta
d86dd60c63 Merge pull request #9064 from Loganbacca/smokeFix 
Chem smoke fadeOut sanity checks
 2015-05-04 14:52:33 +02:00
volas
7ff68f8757 Modification to 'cinematic' command 2015-05-04 12:10:59 +03:00
RavingManiac
6123c8421e Intent menu appears on zoom 2015-05-04 16:58:24 +10:00
Kelenius
e4ce047bd1 Chemistry-Reagents: absolute paths and split 2015-05-04 00:29:42 +03:00
RavingManiac
97adee16db Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked 
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
 2015-05-03 21:53:02 +10:00
RavingManiac
f1ccb3ee6e Muzzle-flash lighting effect for guns 
Energy guns now display shots remaining on examine
 2015-05-03 12:19:11 +10:00
PsiOmega
3866fda394 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm
 2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50 Adds two missing pooling instances and corrects broken grilles health status. 2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19 Grilles and rods. 
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
 2015-05-02 21:35:02 +02:00
PsiOmegaDelta
5d13f3091c Merge pull request #9067 from Jarcolr/gauniform 
Adds foxeye's approved custom item
 2015-05-02 21:19:22 +02:00
Chinsky
a9b1f8bfe0 Merge pull request #9042 from PsiOmegaDelta/Buttons 
Small remote button refactor.
 2015-05-02 19:50:24 +03:00
Jarcolr
471988b080 Adds foxeye's custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
 2015-05-02 11:19:52 +03:00
volas
93d120a24c merge fix 2015-05-02 11:16:15 +03:00
Chinsky
d5495870d1 Merge pull request #9045 from mwerezak/resist 
Resist code cleanup, plus fixes
 2015-05-02 08:22:51 +03:00
Chinsky
aeda1db3c5 Merge pull request #9041 from PsiOmegaDelta/ChitterChitter 
Fixes #9029.
 2015-05-02 08:22:09 +03:00
Chinsky
144c1eb321 Merge pull request #9033 from mwerezak/zas-fix 
Fixes #8987, lost edges from merged zones
 2015-05-02 08:21:53 +03:00
Chinsky
8f1a9a9375 Merge pull request #9040 from PsiOmegaDelta/LOOCToggle 
Admins can now toggle OOC and LOOC separately from each other.
 2015-05-02 08:21:50 +03:00
Loganbacca
6238dabf88 Chem smoke fadeOut sanity checks 
Ported updates from /tg/ to fadeOut code. Updates written by vista-
 2015-05-02 13:33:25 +12:00
mwerezak
b10c64d48b Adds a closet breakout animation, fixes spamming the breakout proc 2015-05-01 16:19:52 -04:00
mwerezak
3509178aa8 More resist refactoring 
Reorganizes resist a bit more to allow for cleaner inheritance.
 2015-05-01 15:13:07 -04:00
Ccomp5950
3baed4686e Merge pull request #9039 from PsiOmegaDelta/QdelBullet 
Fixes #9037.
 2015-05-01 10:45:10 -04:00
PsiOmega
b34e44ab84 Mice are now numbered. 
You are not a man. This should also make things easier for admins.
 2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e Fixes #9044 
Apparently stunned ticks down after grabs are updated.
 2015-05-01 02:09:43 -04:00
mwerezak
98a4f54b88 Adds span classes, moves secure closet procs 2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279 Resist verb cleanup 
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
 2015-05-01 01:23:26 -04:00
Chinsky
3d7bfd8aff Merge pull request #9007 from PsiOmegaDelta/Initialize 
Removes the need for spawn() in New() procs.
 2015-04-30 21:12:06 +03:00
PsiOmega
5bbe839092 Fixes an ancient bug where door buttons toggling bolts were inversed, causing the first click to do nothing. 2015-04-30 19:34:25 +02:00
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +02:00
PsiOmega
904efa322f Breaks up the remote door control button into subtypes, depending on what is remotely controlled. 
Also ensures that the door button respects cut wires, etc.
 2015-04-30 18:26:31 +02:00