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
28,362 Commits 8 Branches 0 Tags
36755f077c94bbdd4db12836ea8c901b39daae86
Commit Graph

12939 Commits

Author SHA1 Message Date
Chinsky
0f76c59944 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir 
Conflicts:
	icons/mob/head.dmi
 2015-09-02 04:50:00 +03:00
Chinsky
a3b3e52959 Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir 2015-09-02 04:38:26 +03:00
GinjaNinja32
a6cdeee95c Add autohiss/purr on a per-client toggle 2015-09-01 23:37:56 +01:00
PsiOmega
6e2514d728 Beepsky should no longer attempt to arrest himself. 
Adds additional threat check.
 2015-09-01 18:25:51 +02:00
Chinsky
03f5254850 Restores suit rolling verb. 2015-09-01 13:50:38 +03:00
Chinsky
667debfb3c Merge pull request #10745 from mwerezak/mob-grab 
Cleans up mob_grab.dm
 2015-09-01 12:58:50 +03:00
Chinsky
cf0a3f94d0 Merge pull request #10808 from Hubblenaut/dev 
Bar drinks
 2015-09-01 12:56:54 +03:00
Chinsky
28cf860332 Adds revolver spin sound. 2015-09-01 12:18:49 +03:00
Zuhayr
1362271e60 Added short-sightedness for species, added groundwork for variant species sight flags. 2015-09-01 11:42:33 +09:30
Zuhayr
bd76f977da Added a complex holder for human mobs + example icons (for an unadded species) 2015-09-01 11:39:22 +09:30
Zuhayr
3f6f34c16f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi
 2015-09-01 11:22:10 +09:30
Zuhayr
7581717246 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	maps/exodus-1.dmm
 2015-09-01 10:55:19 +09:30
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +02:00
GinjaNinja32
2d4c56a41e Merge pull request #10940 from Zuhayr/dev 
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
 2015-08-31 20:57:40 +01:00
Raptor1628
a7ff1a09ee Adds Supply Fax 
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
 2015-08-31 15:32:35 -04:00
Zuhayr
7f97527471 Merge pull request #10581 from Kelenius/ofMechfabAndPanic 
Updates mechfab
 2015-08-31 17:39:04 +09:30
Kelenius
57ab846273 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	maps/exodus-1.dmm
 2015-08-31 10:57:04 +03:00
Zuhayr
9f54a71c2c Limbs now copy hair data from their owner and may have optional body hair icons blended into them. 2015-08-31 16:34:13 +09:30
PsiOmegaDelta
f35e614150 Merge pull request #10958 from caelaislinn/emitter_fix 
Fixes emitter runtime by using new calling syntax
 2015-08-31 08:58:07 +02:00
Zuhayr
14c57fcf11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
 2015-08-31 16:17:24 +09:30
Cael Aislinn
1de511b545 fixes emitter runtime by using new calling syntax 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 16:41:43 +10:00
Joseph Heinemeyer
8c61c3ab6f Fixes multi-z things. 2015-08-30 18:58:37 -07:00
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
Datraen
fa566fbe47 [Botany] Gas-related traits revealed on the plant analyzer 
http://baystation12.net/forums/threads/the-little-things-4-with-a-vengance.9/page-11#post-10909
 2015-08-30 11:58:39 -04:00
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +02:00
PsiOmega
6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
 2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f Merge pull request #10939 from Baystation12/master 
Dev-freeze
 2015-08-30 10:20:32 +02:00
Zuhayr
92d3e6d240 Fixes Yongauni#155 2015-08-30 11:45:54 +09:30
Chinsky
bfa54052f8 Merge pull request #10891 from Peliia/Peliia-patch-1 
Virology Tiny Fixes
 2015-08-29 23:27:15 +03:00
Chinsky
9edeb3cc08 Merge pull request #10908 from Matthew951/8-27-2015-adds-Volaju-hair 
Adds a new set of hair and facial hair
 2015-08-29 23:26:30 +03:00
PsiOmega
e1aa20fda5 Radio changes. 
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
 2015-08-29 17:12:48 +02:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
Zuhayr
dfbdd79375 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2015-08-29 16:53:42 +09:30
Zuhayr
7d82e4850e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-29 16:53:07 +09:30
Zuhayr
165f30b274 Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime 
Alters the round duration format, increases Stat inactivity timeout.
 2015-08-29 07:41:23 +09:30
mwerezak
db8aefb121 Refactors duplicate parry code 2015-08-28 14:39:28 -04:00
mwerezak
3e967872a3 Allows grabs to be resisted while weakened 2015-08-28 14:08:59 -04:00
Daranz
d5b618adac Fix Say ":i" working with intercoms, re-add restraint check for Say ":i" 
See also commits:
e9d9ff57ba
bbc8ad6383
b9dbeeb356
 2015-08-28 17:33:52 +02:00
PsiOmega
daef0ccec8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-28 11:27:20 +02:00
PsiOmega
ff7a4fc244 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/events/event_container.dm
 2015-08-28 11:18:57 +02:00
Chinsky
c642e8c729 Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs 
Improved admin logging.
 2015-08-28 10:32:35 +03:00
PsiOmegaDelta
916530f3dc Merge pull request #10911 from GinjaNinja32/table-defines 
improve defines in table code
 2015-08-28 07:27:12 +02:00
GinjaNinja32
a286bd24b4 improve defines in table code 
the defines were inverted, this uninverts them
also fixes #undef of old names for things
 2015-08-28 00:12:18 +01:00
Matthew951
78a129db9d Adds a new set of hair and facial hair 
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
 2015-08-27 14:47:02 -04:00
GinjaNinja32
23f5581a35 Merge pull request #10894 from mwerezak/moderate-virus 
Makes moderate virus events one-shot
 2015-08-27 19:46:11 +01:00
PsiOmega
f68275d91b Improved admin logging. 
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
 2015-08-27 20:20:20 +02:00
PsiOmega
c5e09c30d6 Alters the round duration format, increases Stat inactivity timeout. 
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
 2015-08-27 20:01:38 +02:00
PsiOmega
5873026915 Adds missing message assignment. Removes now unnecessary message formatting. 2015-08-27 19:35:44 +02:00
Peliia
8743cd89a4 Dish Incubator v2 
Adheres to pointers laid out by Ginja.
 2015-08-27 18:59:16 +02:00