cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,362 Commits 5 Branches 0 Tags
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

12939 Commits

Author SHA1 Message Date
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
Samuel Novák
12a0bae5bd Stop resting when pAI chassis collapses 2015-09-05 21:53:21 +02:00
GinjaNinja32
8685ff42a4 Merge pull request #11008 from Zuhayr/antaghud 
Refactored the antagHUD to work better with the new antagonist system.
 2015-09-05 17:01:57 +01:00
GinjaNinja32
348f678b81 Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess 
Observers can now view radio settings, admins can alter them.
 2015-09-05 16:59:42 +01:00
GinjaNinja32
ef208a55aa Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents 
Vent crawling now explicitly checks for equipped items.
 2015-09-05 16:59:33 +01:00
Zuhayr
f8bf428e66 Merge pull request #10981 from comma/technoir 
MrSnapwalk's Detective Uniform Resprite
 2015-09-06 00:48:50 +09:30
Zuhayr
d03d9eebca removing now unneeded limb define. 2015-09-06 00:42:54 +09:30
Zuhayr
34a0c2f080 Added Resomi blood/damage masks. 2015-09-06 00:42:02 +09:30
Zuhayr
3e015d7c71 Added three human subspecies. 2015-09-06 00:39:08 +09:30
Zuhayr
808bbee90f Added species vars for oxy/tox/rad/flash resistance. 2015-09-06 00:39:05 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Zuhayr
2d91711fcc Tail icons now use tail_hair var for overlays. 2015-09-05 16:07:24 +09:30
Zuhayr
1c2cea708d Mousedrop runtime fix. 2015-09-05 14:45:57 +09:30
Chinsky
34662a83b5 Merge pull request #10998 from Zuhayr/antagsystem 
Antag system fixes.
 2015-09-05 07:56:42 +03:00
Zuhayr
f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
Zuhayr
8c743329df Merge pull request #10955 from SkyMarshal/multi-z 
Overhauls Multi-Z
 2015-09-05 11:36:59 +09:30
Zuhayr
12a5c47413 Added a proper cooldown on latespawn, added loyalist role to char setup. 2015-09-05 10:46:23 +09:30
Neerti
e4267ea449 Adds chemical meter on HUD. 2015-09-04 16:57:55 -04:00
Daranz
ddeec9c89a Fix effects for clonexadone 2015-09-04 16:06:03 +02:00
Neerti
b93595c19f Merge branch 'master' into 9/4/2015_master_to_dev 
Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm
 2015-09-04 08:43:37 -04:00
Zuhayr
553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmega
93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
PsiOmega
1f39768ce1 Vent crawling now explicitly checks for equipped items. 
Fixes #10991.
 2015-09-04 08:09:05 +02:00
SinTwo
73f13d8084 Hairfix 2015-09-03 20:26:44 -04:00
SinTwo
4e360779ed Guns, Coats, and Hair Oh My 
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
 2015-09-03 19:51:26 -04:00
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
Zuhayr
cae57f022e Added by-species hat light overlays. 2015-09-04 08:56:45 +09:30
Zuhayr
0a355c84a3 Added species checks for robolimb use. 2015-09-04 08:55:27 +09:30
Chinsky
94f7538d01 Merge pull request #10934 from PsiOmegaDelta/150822-Intercoms 
Removes radio free range option, adds out-of range options
 2015-09-03 20:47:39 +03:00
PsiOmegaDelta
7bcf9aaea9 Merge pull request #10340 from comma/russian_roulette 
Russian roulette and russian roulette accessories
 2015-09-03 19:40:01 +02:00
Chinsky
72d768808a Merge pull request #10110 from mwerezak/shields 
Better shield handling
 2015-09-03 20:38:48 +03:00
Chinsky
9728f28880 Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech 
Relocates Cult/Occult languages to unused keys.
 2015-09-03 20:37:16 +03:00
Chinsky
431db2bdbb Merge pull request #10970 from Zuhayr/complexholder 
Added a complex holder for human mobs + example icons
 2015-09-03 20:36:17 +03:00
PsiOmegaDelta
ad2e922776 Merge pull request #10971 from Zuhayr/sight 
Added short-sightedness and sight flags proc.
 2015-09-03 17:21:05 +02:00
PsiOmega
e5aa095f09 Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 2015-09-03 09:38:15 +02:00
GinjaNinja32
00a05bbdaa Remove a world.log print, change '0' to 'AUTOHISS_OFF' for clarity 2015-09-02 19:39:50 +01:00
GinjaNinja32
9dca74f755 add list typing to maps and exemption list 2015-09-02 19:11:59 +01:00
GinjaNinja32
f0b02d8035 Cleans up auto-hiss, makes declaring new auto-hiss strings a simple list declaration 2015-09-02 19:07:20 +01:00
PsiOmega
593922929b Changelog entry. 2015-09-02 16:54:54 +02:00
PsiOmega
a7c527f491 Compilation fixes. 2015-09-02 15:14:24 +02:00
PsiOmega
affff253bc Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm
 2015-09-02 14:58:13 +02:00
PsiOmega
d78db0231b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-02 14:42:27 +02:00
PsiOmega
13780eba09 Rotates and otherwise cleans up map intercom usage. 2015-09-02 14:26:59 +02:00
PsiOmega
1b23f794c5 Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms 2015-09-02 10:54:04 +02:00
Zuhayr
2a02f4890c Merge pull request #10336 from atlantiscze/phoronwindowsv2 
Borosilicate windows
 2015-09-02 16:11:39 +09:30