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

19125 Commits

Author SHA1 Message Date
PsiOmega
9d883ea914 Corrects implanter attack log. 
The contents of the implant was reported in the attacker/victim log but not the admin log.
 2015-05-10 15:11:37 +02:00
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions 
Enforces antagHUD restrictions.
 2015-05-10 06:03:36 -04:00
PsiOmega
647298e550 Fixes #9169. 
Drones can now survive entering chargers and being picked up.
 2015-05-10 10:52:56 +02:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
 2015-05-10 10:43:46 +02:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3 
Admin dice
 2015-05-10 10:11:29 +02:00
PsiOmegaDelta
cd264fb558 Merge pull request #9160 from GinjaNinja32/acting_manifest 
Acting jobs now sort with non-acting jobs on the manifest.
 2015-05-10 10:10:13 +02:00
MrSnapwalk
753d63439c Removes the leading comma in software.dm. 2015-05-10 02:24:10 -05:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
MrSnapwalk
34eb2872b6 Makes the code compile by adding a comma and removing some unused lines. 2015-05-10 02:03:28 -05:00
Zuhayr
c0bb92bf34 Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles 
Station alarm monitor changes.
 2015-05-10 15:37:50 +09:30
Zuhayr
a64f91994b Merge pull request #9151 from Yoshax/nomorechems 
Removes sleepy chems from cloning
 2015-05-10 15:37:21 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile 
Made sterile gloves actually start sterile
 2015-05-10 15:11:29 +09:30
MrSnapwalk
89aa07fdf9 Adds new pAI sprites by WalterJe, adds a few more emotions (neutral, silly, :^), smirk, exclamation points, and question mark). Adjusts Tudoreleuu's custom item sprite to fit the new screen sprites. 2015-05-10 00:40:13 -05:00
MrSnapwalk
7e8a173fd4 Adds 7 new AI core sprites. 2015-05-09 18:02:30 -05:00
Chinsky
6618b225a0 Made sterile gloves actually start sterile 
Fixes #9163
 2015-05-09 22:10:39 +03:00
Yoshax
8f9fd29c5f Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits) 
Squashed commits:

[2c002f9] Removes sleepy chems from cloning
 2015-05-09 20:08:19 +01:00
Yoshax
6c121d232b Makes bear traps do damage when stepped on 2015-05-09 19:57:01 +01:00
Techhead0
95aef467a0 Magboots can be worn over shoes 
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
 2015-05-09 14:20:03 -04:00
volas
9fadad7b33 Player age now displayed also in notes 2015-05-09 19:33:11 +03:00
volas
84696567d8 Ability to select job equipment in 'Select Equipment' 2015-05-09 19:29:26 +03:00
GinjaNinja32
75b5cf0b1e Acting jobs now sort with non-acting jobs on the manifest. 2015-05-09 15:36:04 +01:00
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
Kelenius
fedd0342a0 Minor chem fixes 2015-05-09 12:03:22 +03:00
PsiOmegaDelta
2a53f6bf6d Merge pull request #9153 from Techhead0/rlimb_data-fix 
Fixes rlimb assignment for hands/feet in chargen
 2015-05-09 10:00:10 +02:00
Techhead0
e368c78b42 Fixes rlimb assignment for hands/feet in chargen 
An easy fix for a small typo that caused rlimbs not to be assigned to
second_limb (hands/feet). I'm surprised the bug went unnoticed this
long.
 2015-05-08 21:12:15 -04:00
Chinsky
513579b8ac Merge pull request #9140 from PsiOmegaDelta/Accounting 
Fixes #9139.
 2015-05-08 19:41:57 +03:00
PsiOmega
b98461c2af Station alarm monitor changes. 
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
 2015-05-08 11:22:29 +02:00
PsiOmega
999b0ca99d Compilation fixes. 2015-05-08 08:33:41 +02:00
PsiOmega
28d24fc8c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/atmos_control.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/modules/mob/mob_helpers.dm
 2015-05-08 08:23:15 +02:00
Ccomp5950
a36acc8eba Merge pull request #9136 from GinjaNinja32/CyborgIsNotAI 
Fixes cyborgs showing up as AIs in radio output for AIs.
 2015-05-07 23:23:54 -04:00
Ccomp5950
c1350e8df8 Merge pull request #9101 from StarSmasher44/patch-3 
Applies Icon Caching to battery racks, Fixed edition
 2015-05-07 23:20:30 -04:00
Ccomp5950
7e120053ed Merge pull request #9137 from GinjaNinja32/tcomms 
Fixes... things. Lots of things.
 2015-05-07 23:16:02 -04:00
PsiOmega
72dc583ef5 Fixes #9139. 
Arranges the order at which starting funds is set and account creation is done.
 2015-05-07 19:23:56 +02:00
GinjaNinja32
2e2cb07ba7 Fixes... things. Lots of things. 2015-05-07 15:32:16 +01:00
GinjaNinja32
cec16d7559 Fixes cyborgs showing up as AIs in radio output for AIs. 
Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same.
 2015-05-07 14:48:18 +01:00
PsiOmega
d7e5792f98 Ensures dionaea nymphs respect antagHUD restrictions. 2015-05-07 13:28:35 +02:00
PsiOmega
d6429afcba Cultists can no longer manifest ghosts with antagHUD enabled. 2015-05-07 10:35:25 +02:00
PsiOmega
783e437c5e Enforces antagHUD restrictions. 
antagHUD checks were missing in a few places.
Can no longer join as drone, ERT member, or pAI if you have enabled antagHUD.
 2015-05-07 09:55:26 +02:00
PsiOmega
7cbd72d1be Cleanup. 2015-05-07 09:09:12 +02:00
PsiOmega
2eb35c6de8 Relocates the new ERT id-card creation code to its appropriate location. 2015-05-07 08:44:54 +02:00
PsiOmega
10edb06036 Do not copy-paste code. 
Do not copy-paste code.
 2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
 2015-05-07 08:14:57 +02:00
mwerezak
f3dd96bb8c Adjusts charge costs for gun/energy 
In particular, charge costs were chosen so that mounted energy guns
drain 80% of a default rig's power cell in 40 shots, and mounted laser
cannons drain the same in 20 shots.
 2015-05-07 00:13:21 -04:00
mwerezak
3e1e137cec Adds device powercells 
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
 2015-05-06 23:41:57 -04:00
Zuhayr
7389ec379f Merge pull request #9112 from PsiOmegaDelta/SenseMe 
Adds stretches of power cable around the construction outpost.
 2015-05-07 09:30:17 +09:00
Ccomp5950
143bde9774 Merge pull request #9111 from PsiOmegaDelta/AreaContentsConcat 
Cloning vats and DNA scanners are again located by cloning computers.
 2015-05-06 17:31:19 -04:00
Ccomp5950
f2b4543ba6 Merge pull request #9113 from PsiOmegaDelta/AntagOOCRights 
Ensures only antags and admins can see AntagOOC.
 2015-05-06 17:30:58 -04:00
Chinsky
af7ec5c8ad Merge pull request #9099 from StarSmasher44/patch-2 
Adds Icon Caching for some Mob HUD Icons
 2015-05-06 19:01:20 +03:00
StarSmasher
89e37938ca Optimizes invalidateCameraCache() 
Before optimization it used 20.155 Total CPU/Self CPU on 183 calls
After optimization it used 0.443 Total CPU/Self CPU on 223 calls.
 2015-05-06 17:41:32 +02:00