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
27,269 Commits 10 Branches 0 Tags
a7c527f491bb0c0f90503f771e1f7389a25b54af
Commit Graph

20522 Commits

Author SHA1 Message Date
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
Zuhayr
2a02f4890c Merge pull request #10336 from atlantiscze/phoronwindowsv2 
Borosilicate windows
 2015-09-02 16:11:39 +09:30
PsiOmega
6e2514d728 Beepsky should no longer attempt to arrest himself. 
Adds additional threat check.
 2015-09-01 18:25:51 +02:00
PsiOmegaDelta
fb670400a1 Merge pull request #10976 from caelaislinn/computer_fix 
Fix for runtime in skills computer
 2015-09-01 12:25:29 +02:00
Cael Aislinn
0228ca4959 fix for runtime in skills computer 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-01 20:05:42 +10: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
Zuhayr
cc0f4f7e90 Merge pull request #10964 from caelaislinn/telecomms_fix 
Fixes an obscure runtime in telecomms code
 2015-09-01 13:56:41 +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
Atlantis
d12002c536 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-09-01 02:57:36 +02:00
GinjaNinja32
9667eac972 Merge pull request #10961 from PsiOmegaDelta/150831-OpenFire 
Ports the portable turret projectiles to the new system.
 2015-08-31 20:57:55 +01: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
GinjaNinja32
09fd54e12c Merge pull request #10959 from PsiOmegaDelta/150831-GetThatTurf 
Ports LummoxJr's get_turf()
 2015-08-31 20:57:02 +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
Cael Aislinn
8f05e2f63a fixes an obscure runtime in telecomms code 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 18:57:42 +10: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
f86eba984c Merge pull request #10962 from caelaislinn/remote_emitter_fix 
Fixes runtime in remote emitter activation button
 2015-08-31 17:25:57 +09:30
Cael Aislinn
9f1407c196 fixes runtime in remote emitter activation button 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 17:45:20 +10:00
PsiOmega
337333d45e Ports the portable turret projectiles to the new system. 2015-08-31 09:10:58 +02: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
PsiOmega
af86b8a935 Ports LummoxJr's get_turf() 2015-08-31 08:45:20 +02:00
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
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
GinjaNinja32
491bb6931a Merge pull request #10944 from PsiOmegaDelta/150830-Cleanup 
Removes duplicate definitions.
 2015-08-30 19:18:53 +01: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
080e07976a Removes duplicate camera network definitions. 2015-08-30 15:51:05 +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
PsiOmegaDelta
f707050c0f Merge pull request #10926 from Sligneris/patch-1 
"Junior Officer" alt-title
 2015-08-29 18:23:16 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00
PsiOmega
22262507b9 Only living mobs now trigger shrapnel. 
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
 2015-08-29 10:03:58 +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
Sligneris
8046fa0fb2 "Junior Officer" alt-title 
Adds "Junior Officer" as an alternative job title to Security Officers.

Pros:
- replaces "Security Cadet" as a title that signalizes lesser experience,
- opens up roleplay possibilities,
- gives no potential room for slot abuse,
- gives a reason for a character to make mistakes, allowing for some antag opportunities!

Cons:
- gives a reason for a character to make mistakes.
 2015-08-29 02:34:08 +02:00
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
Atlantis
601c525a4b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-08-28 20:38:04 +02: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