cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,392 Commits 5 Branches 0 Tags
37acbe9bf7edfb20a83d2f14bbddfa49b5c0207b
Commit Graph

10738 Commits

Author SHA1 Message Date
Zuhayr
2bc8212d2a Fix for subtypes of X mob not being able to understand each other. 2013-08-16 19:00:08 -07:00
Mloc
326b51f4a4 Merge pull request #3531 from Zuhayr/dev 
Languages/species mucking around.
 2013-08-16 11:33:03 -07:00
Zuhayr
3569529d51 Added languages to monkey variants. 2013-08-17 04:17:21 -07:00
Zuhayr
387fbff346 Added some varying temperature and pressure values for different species. 2013-08-17 04:15:16 -07:00
Zuhayr
9743fe673b Added NO_BREATHE flag check in human Life() proc. 2013-08-17 04:14:54 -07:00
Zuhayr
f90dcdeaee Added Diona language, Rootspeak. 2013-08-17 03:47:05 -07:00
Zuhayr
f6486ad9fd Removed Pierrot's Throat and miming code from say.dm. 2013-08-16 18:07:32 -07:00
Zuhayr
94db7a2dc1 These files have been collapsed into root procs and can be deleted. 2013-08-16 17:48:25 -07:00
Zuhayr
1e9cb31fec A ton of preliminary work condensing say_quote and say_understands down to the basic common procs between mob types. 2013-08-16 17:46:07 -07:00
Zuhayr
4da487ad89 Brain borers can now take monkeys as hosts. 2013-08-16 16:24:25 -07:00
Zuhayr
72822b7f73 Allows subtypes to understand/speak to the parent type. 2013-08-16 13:41:35 -07:00
Zuhayr
319bdcc069 Added diona nymphs as diona monkey-analogues. 2013-08-16 13:39:36 -07:00
Zuhayr
7b1c0ff49e Using dev map. 2013-08-16 13:04:22 -07:00
Mloc
4796f8439e Merge pull request #3529 from Zuhayr/dev 
Fixes form master, Unathi<->Soghun removal, dionaea changes, lots of say refactoring.
 2013-08-16 05:07:42 -07:00
Zuhayr
2f58a6fe62 Merge pull request #3527 from comma/dev 
Removes Alien syndrome because it kinda does not make sense.
 2013-08-15 20:23:29 -07:00
Chinsky
34cd3cdedf Removes Alien syndrome because it kinda does not make sense. 2013-08-16 07:14:57 +04:00
Zuhayr
8df4c42c63 Merge pull request #3523 from Mloc/dsayfix 
Probable fix for deadchat randomly breaking.
 2013-08-15 17:27:11 -07:00
Mloc
7ffb680cdd Merge pull request #3524 from SkyMarshal/airfixes 
Fixes a derp with the insulation code.
 2013-08-15 15:12:49 -07:00
SkyMarshal
9f540e2606 Fixes a derp with the insulation code. 2013-08-15 10:03:51 -07:00
Mloc-Argent
85d3d2787e Probable fix for deadchat randomly breaking. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-15 17:34:03 +01:00
Zuhayr
9e58d93fd6 Removing snowflake checks for Soghun. 2013-08-16 01:01:12 -07:00
Mloc-Argent
1e980a9cc1 Merge branch 'master' into dev 2013-08-15 15:29:53 +01:00
Segrain
fa76668500 Colouring tempfix. 2013-08-15 10:29:29 +03:00
Lethal Ghost
5c958fe6b6 Remove useless code 2013-08-15 13:17:06 +06:00
Zuhayr
d937900d13 Compile fix. 2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44 Merge resolution in Engineering.dm 2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
Zuhayr
c19d136996 Podman fix. 2013-08-14 19:58:39 -07:00
Chinsky
b8dc7cc939 Merge pull request #3505 from Zuhayr/master 
Language cleanup/mouse speech fix.
 2013-08-13 16:48:45 -07:00
Zuhayr
f6a562e8ed Couple of typos. 2013-08-14 09:47:52 -07:00
Zuhayr
45a26fcad9 Removed a debug string. 2013-08-14 02:19:36 -07:00
Zuhayr
64c5beaf8c Forgot to change back some testing keys for languages, whoops. 2013-08-14 02:16:11 -07:00
Zuhayr
9ec5c72d96 Cleaned up language handling, fixed mouse speech understanding. 2013-08-14 02:13:06 -07:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
623a2978b7 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:09 -07:00
Zuhayr
1bdb1b6694 Merge pull request #3507 from Segrain/master 
Internals for everyone.
 2013-08-13 16:39:14 -07:00
Zuhayr
38ad57ea95 Merge pull request #3511 from DJSnapshot/master 
Added brown vest or webbing for chief engineer's locker
 2013-08-13 16:38:30 -07:00
DJSnapshot
cb20332de5 Added potential for chief engineer's locker to spawn with either a brown vest or webbing 2013-08-13 16:16:20 -07:00
Jamini
f05c44dc23 Praying this works 
Added Lockable lockers for atmos techs
Adjusted equipment in lockers
Adjusted wardrobe lockers
Added Engineering berets
Rearranged equipment in engineering

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-08-13 18:57:08 -04:00
Mloc-Argent
7ac43fa871 Merge branch 'master' into dev 2013-08-13 22:21:37 +01:00
Mloc-Argent
e2e747fa0a Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-13 22:21:09 +01:00
Mloc-Argent
310283f581 Merge branch 'master' into dev 2013-08-13 22:20:39 +01:00
meyar
551fee16eb Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW. 2013-08-13 16:51:48 -04:00
meyar
e74782bbdb Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken. 2013-08-13 16:51:15 -04:00
meyar
2819b6ac96 Gives IA security headsets as DEMOCRACY'D here: http://baystation12.net/forums/viewtopic.php?f=5&t=8096 2013-08-13 16:49:17 -04:00
meyar
70176f7132 Gives those asshole greyshirts fukkin' air tanks. The fucks. 2013-08-13 16:45:46 -04:00
Segrain
4e2ba5325a Internals box fix. 2013-08-13 21:06:38 +03:00
Lethal Ghost
68e9e5d924 Very very old bug. 
From Russia with love
 2013-08-13 23:31:55 +06:00
Zuhayr
bbfe26bde8 Merge pull request #3503 from Mloc/master 
Fully reverts clickdelay change.
 2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00