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

19451 Commits

Author SHA1 Message Date
PsiOmegaDelta
beeef3d66f Changes the RCON computer to use the power screen instead. 2015-07-08 08:37:07 +02:00
PsiOmega
aeb15a85be Adds missing R&D screens. Fixes the employee computer by cheating. 2015-07-07 17:32:59 +02:00
PsiOmegaDelta
87d4cf4f68 Computers are now overlay based. 
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931.
 2015-07-07 17:23:49 +02:00
PsiOmega
cee5f1a057 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items.dm
 2015-07-06 18:33:09 +02:00
PsiOmega
cdb4270f48 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-06 17:31:41 +02:00
Kelenius
eb64e0c5b6 Fixes a bug where mob sees visible message twice 2015-07-06 15:58:31 +03:00
PsiOmegaDelta
8f24ad03d2 Merge pull request #10019 from GinjaNinja32/provisional 
Adds 'Provisional' to the list of acting rank prefixes
 2015-07-05 22:26:15 +02:00
PsiOmegaDelta
f134ef55a1 Merge pull request #10012 from mwerezak/guntweak 
Shooting and machine/structure penetration tweaks
 2015-07-05 22:26:05 +02:00
Zuhayr
8305dd65a3 Merge pull request #10011 from GinjaNinja32/robot-inventory 
Changes cyborg HUD to not display a superfluous empty row
 2015-07-06 05:55:34 +09:30
Zuhayr
69168b8b29 Merge pull request #10020 from PsiOmegaDelta/170605-NullSpaceShield 
qdel shield generators no longer runtime every tick until hard deleted.
 2015-07-06 05:54:18 +09:30
Zuhayr
2129bf6c2e Merge pull request #10014 from mwerezak/raider-gear 
Fixes issues with equipping raiders, raider gun type
 2015-07-06 05:48:25 +09:30
Chinsky
0b22c65eca Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate 
Rejuvenation now clears chemicals in mobs.
 2015-07-05 23:08:01 +03:00
PsiOmega
d9af4af844 Fixes #10024. 
/mob/living/silicon/robot/handle_regular_hud_updates() called handle_regular_hud_updates() and then recursion kept happening.
 2015-07-05 21:24:39 +02:00
Chinsky
c5eb043a46 Merge pull request #9998 from Kearel/trayFix 
Fixing Tray Bug
 2015-07-05 20:10:26 +03:00
PsiOmega
d32b58790d A deleted shield generator no longer runtime every tick until force-deleted. 2015-07-05 17:33:55 +02:00
GinjaNinja32
25a4fb7d9a Adds 'Provisional' to the list of acting rank prefixes 2015-07-05 12:29:46 +01:00
PsiOmegaDelta
1910a9a12d Merge pull request #10016 from mwerezak/airlockfix 
Airlock and atmos machine fixes
 2015-07-05 08:43:16 +02:00
mwerezak
1abb52532d Merge branch 'atmosfix' into airlockfix 2015-07-05 01:20:33 -04:00
mwerezak
bd59733fdb Fixes #9714 
Fixes incorrect arguments to calculate_transfer_moles()
 2015-07-05 01:18:38 -04:00
mwerezak
6b550f7166 Fixes more instances of = instead of += inside loop 2015-07-05 01:02:52 -04:00
mwerezak
c46f32e8d7 Airlock controller fixes 
Fixes airlocks opening their doors before the pumps have turned off.
Fixes airlocks getting confused if you mash buttons in quick succession.
 2015-07-04 23:49:54 -04:00
mwerezak
508827580c Formatting 2015-07-04 22:39:09 -04:00
mwerezak
c1bbc5c3a6 Fixes issues with raider equipping 
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
 2015-07-04 16:32:35 -04:00
mwerezak
fad0a712d8 Expands raider gear list 2015-07-04 15:39:31 -04:00
mwerezak
cf5e4a17d6 Adds raider gun type, fixes sawn shotgun inhands 
Also adds type def to allow spawning sawn shotguns.
 2015-07-04 15:39:05 -04:00
mwerezak
8d1e669588 Shooting while on help intent no longer auto switches to hostage mode 2015-07-04 10:47:56 -04:00
mwerezak
ef538f2a8c Adjusts bullet penetration chance for default machines and structures 2015-07-04 10:46:38 -04:00
GinjaNinja32
b8e0015be1 Changes cyborg HUD to not display a superfluous empty row 
Title. Modules with precisely 8, 16, 24 etc items were showing an extra row, this changes it from floor(X/8)+1 to just ceil(X/8).
 2015-07-04 14:47:10 +01:00
PsiOmega
5518c60daf Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-04 15:33:48 +02:00
PsiOmega
6e93b7d604 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/verbs/deadsay.dm
 2015-07-04 15:19:52 +02:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
PsiOmegaDelta
fb60cfde4c Rejuvenation now clears chemicals in mobs. 
Fixes #9921.
 2015-07-03 16:41:10 +02:00
PsiOmegaDelta
41d86361a0 Merge pull request #9999 from Baystation12/dev-freeze 
Dev.
 2015-07-02 21:24:09 +02:00
Kearel
9a6391747d fix trays 
Puts pikcup proc before loc is changed.
 2015-07-02 13:55:27 -05:00
GinjaNinja32
88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket 
Fixes #9986.
 2015-07-02 13:55:27 +01:00
GinjaNinja32
a2e66b4095 Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix 
Speech impediment fixes.
 2015-07-02 13:54:16 +01:00
Zuhayr
9a7515af8f Merge with dev-freeze. 2015-07-02 19:04:01 +09:30
Zuhayr
2a32150658 Merge pull request #9992 from Baystation12/master 
Master into dev-freeze
 2015-07-02 19:00:00 +09:30
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
db1135169d Fixes #9986. 
A simple matter of a missing return line.
 2015-07-02 10:43:22 +02:00
PsiOmegaDelta
a98c4a2c8e Speech impediment fixes. 
Fixes #9987.
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
 2015-07-02 10:04:08 +02:00
Chinsky
42a1ad8b81 Merge pull request #9985 from GinjaNinja32/teleport 
Fixes the third teleportation effect
 2015-07-02 09:13:03 +03:00
GinjaNinja32
7b1d9a54be Fixes the third teleportation effect 
why isn't this a proc
 2015-07-02 06:36:30 +01:00
Chinsky
0b9d9167f7 Merge pull request #9980 from mwerezak/supermatter 
Fixes #9591
 2015-07-02 06:07:42 +03:00
PsiOmegaDelta
b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
 2015-07-01 22:46:40 +02:00
PsiOmegaDelta
977ed13e14 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
 2015-07-01 22:35:00 +02:00
PsiOmegaDelta
791b9eb27d Merge pull request #9981 from Zuhayr/antioxidant 
Removes the RUST engine.
 2015-07-01 08:31:14 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
mwerezak
5ec5fdeb46 Fixes #9591 
Adjusts supermatter radiation range and intensity
 2015-07-01 01:18:14 -04:00
Chinsky
0e6aea6842 Merge pull request #9957 from mwerezak/hats 
Updates hats to use item_state_slots where necessary
 2015-07-01 06:56:21 +03:00