cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,355 Commits 10 Branches 0 Tags
c239ec432a01faed16ca16e2904e8fe5d8affebe
Commit Graph

13642 Commits

Author SHA1 Message Date
Zuhayr
c239ec432a Merge pull request #5536 from Ccomp5950/mentor_no_highlight 
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
 2014-07-08 14:55:04 +09:30
mwerezak
4ac685afd9 Removes duplicate defines, updates comments 2014-07-07 23:18:12 -04:00
Ccomp5950
36cf4bd41e Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.). 2014-07-07 21:37:28 -05:00
Zuhayr
ee432f24ec Merge pull request #5524 from zekesulastin/fix-ui-targeting 
Fixes #4584 and #5200
 2014-07-07 23:02:49 +09:30
Mloc
d1556b0d69 Merge pull request #5513 from Walter0o/patch-1 
fixes another heist mode breaking bug
 2014-07-07 13:42:39 +01:00
Mloc
a00f6a40c8 Merge pull request #5510 from GinjaNinja32/changeui 
Fix Change UI verb
 2014-07-07 13:42:33 +01:00
mwerezak
88f3618e9f Required spaceacillin levels no longer scale 
The amount of spaceacillin required to stop infections is now a flat 5
units, instead of scaling with germ_level.
 2014-07-06 15:53:41 -04:00
mwerezak
6f2fff4a5e Increases the time it takes for germ_level to rise to ambient 2014-07-06 15:45:44 -04:00
mwerezak
cdd27aec4a Infected wounds show up more readily on the health scanner 2014-07-06 15:44:59 -04:00
mwerezak
f3951c702c Spaceacillin now prevents wounds from transferring germs 2014-07-06 15:40:24 -04:00
mwerezak
cb0437ecca Fixes reagent_containers not being usable for surgery 2014-07-06 15:37:05 -04:00
mwerezak
30dc2519e9 Makes bleeding logic a little clearer 2014-07-06 13:22:52 -04:00
mwerezak
aeb587f90b Allows necrosis to be fixed with peridaxon and surgery 2014-07-06 13:02:58 -04:00
ZekeSulastin
c6e1dc461a Makes DNA modifier look at dna.real_name instead of name 2014-07-06 13:02:57 -04:00
mwerezak
5948ed591e Reduces amount of toxin damage dealt by infections 
Reduces the toxin damage dealt by non-necrotic infections by a factor of
1.5. Also increases the germ_level required to reach necrosis.
 2014-07-06 11:19:19 -04:00
mwerezak
267fe55430 Adjusts the curing of infections 2014-07-06 11:04:12 -04:00
mwerezak
f1f9641bb5 Fixes dionaea getting infections 2014-07-06 02:34:49 -04:00
mwerezak
b376f117b8 Makes infections cure faster 2014-07-06 02:33:10 -04:00
ZekeSulastin
fb4d19d8ee Replaces hardcoded UI length with constant 2014-07-05 23:37:12 -04:00
Walter0o
68ad7c7373 fixes another heist mode breaking bug 
vox can never win their inviolate_crew objective due to not having cortical stacks put in them on setup.
i took this code from one_click_antag's create_vox_raider() and edited it slightly.
i was thinking about merging the two procs into one but i will leave that for you to decide.
 2014-07-06 03:32:21 +02:00
Mloc
4981d620d0 Merge pull request #5507 from mwerezak/supply-shuttle-fix 
Supply shuttle fixes
 2014-07-05 23:16:42 +01:00
GinjaNinja32
d389466c8a Fix Change UI verb 2014-07-05 21:28:11 +01:00
Boop
8c3f6f2226 fix a world << THING 
(help)
 2014-07-05 20:28:08 +01:00
mwerezak
6d0a3b864d Shuttle now can only be late when arriving 2014-07-05 14:49:30 -04:00
mwerezak
cd6594f223 Fixes shuttle being late AFTER it arrives 2014-07-05 14:44:07 -04:00
mwerezak
0e15d55b24 Fixes #5459 2014-07-05 14:43:18 -04:00
Mloc
bda1dac41c Merge pull request #5502 from mwerezak/robot-actuator 
Fixes #5499
 2014-07-05 11:33:04 +01:00
Mloc
4c2767203c Merge pull request #5503 from mwerezak/heist-fix 
Fixes Heist ending immediately
 2014-07-05 11:32:37 +01:00
Ccomp5950
2bdab3b5d3 Merge pull request #5504 from mwerezak/supply-shuttle-fix 
Fixes the supply shuttle being stuck in warmup if forbidden atoms are aboard
 2014-07-05 04:15:27 -05:00
Zuhayr
c9ca3cc43e Removes NO_BLOOD from Vox. 2014-07-05 16:04:10 +09:30
Zuhayr
89964ef0fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-07-05 11:04:03 +09:30
mwerezak
6e5824ac33 Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard 
Might be related to #5459, not sure though.
 2014-07-04 19:52:50 -04:00
mwerezak
d538c5c640 Fixes #5499 2014-07-04 19:35:57 -04:00
mwerezak
1aeb094a79 Fixes Heist ending immediately 2014-07-04 19:06:55 -04:00
Walter0o
3e95ad9786 adds shuttle_control access check to proper place 2014-07-04 21:38:39 +02:00
Walter0o
65b5126147 fixes computers eating cards 
this commit : 
ea1060ac33

added in machinery's attack_hand() proc, line 238
```
if(!allowed(user))
		user << "\red Access Denied."
		return 1
```

to almost all machinery including computers, since they call this proc via their attack_hand() procs.

allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id,
NOT the card inside the machine,
as different machines have different vars and systems handling how they can be accessed.

instead of fixing the underlying problem, eject card verbs were added like this one : 
30385c2237

this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs.
 2014-07-04 21:36:23 +02:00
Zuhayr
34d19d16f5 Fffffff fixes crates not budging properly. 2014-07-05 04:17:12 +09:30
Mloc
53de412107 Merge pull request #5493 from Zuhayr/master 
Fixes
 2014-07-04 19:28:54 +01:00
Chinsky
ff835cee53 Merge pull request #5492 from mwerezak/alarm-icon 
Fixes air alarms not updating when area changes alert status
 2014-07-04 20:56:43 +04:00
Mloc-Argent
25ec90ba26 mob: fix a movement issue 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-04 17:54:25 +01:00
Zuhayr
72e18b9eb5 Fixes #5214 2014-07-04 17:56:06 +09:30
Zuhayr
b670cdcdf1 Fixes #5483 2014-07-04 17:48:12 +09:30
Zuhayr
67da4096b3 Fixes #5461 2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8 Fixes #5490 2014-07-04 17:39:45 +09:30
Zuhayr
4b06cf82f0 Fixes #5491 2014-07-04 17:34:30 +09:30
mwerezak
ac1a7ad6e2 Fixes air alarms not updating when area changes alert status 2014-07-04 03:00:42 -04:00
Chinsky
c46667bab4 Merge pull request #5489 from PsiOmegaDelta/AirPermissions 
Fixes #5487
 2014-07-04 05:29:13 +04:00
PsiOmega
b86b80f963 Fixes #5487 
Isolation air alarms now expect atmos, engineering, OR research access.
 2014-07-04 00:28:06 +02:00
PsiOmega
9b97420e97 The AI system integrity restorer no longer needs head AND captain access. 2014-07-04 00:12:41 +02:00
Zuhayr
e260cf5129 Merge pull request #5480 from Hubblenaut/master 
Fixes earmuffs and custom items for ear slot not showing up properly
 2014-07-04 04:41:25 +09:30