cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-08 16:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,880 Commits 8 Branches 0 Tags
c4bc6c307594d0210ff0b6eeea8d9d4e431f61af
Commit Graph

234 Commits

Author SHA1 Message Date
GinjaNinja32
08b967c9e0 Move NanoUI cache update to client/New() 2014-10-11 18:40:09 +01:00
Mloc
056fbd79d1 fixes #6599 
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-06 09:57:01 +01:00
Mloc
37b5aa1c50 fixes #6035 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-02 13:26:28 +01:00
Zuhayr
4e6afd282c Fixes #6488 2014-09-25 17:59:28 +09:30
Zuhayr
9f6c22d437 Reapplies LightningIron's fix for #6131 2014-09-02 10:02:37 +09:30
Zuhayr
7b366f092d Fixes some issues with new Hydro. 2014-08-27 22:04:19 +09:30
Zuhayr
772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map. 2014-08-27 20:46:04 +09:30
LightningIron
39182f0c8f Fix for #6131. 2014-08-23 11:19:15 -05:00
PsiOmega
6a44883afb Fixes #6038. Adds a missing ' 2014-08-21 21:52:59 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Walter0o
a3848871d4 fixes #6007 and future bugs with gear names 2014-08-15 11:11:13 +02:00
Walter0o
94ec887a75 removes unused AI text2speech files and code, 
saves about 4.5 MB traffic per client.
 2014-08-13 11:24:23 +02:00
Zuhayr
beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
PsiOmega
00fcfa7899 Makes it possible to setup pAI configuration from the character setup screen. 2014-08-08 13:31:52 +02:00
PsiOmega
8568a6aa89 Explicit proc/Topic definitions. 2014-08-08 13:21:51 +02:00
Zuhayr
9eefdf4db8 A bit of prep work for integegrating player-set backgrounds into gameplay. 2014-08-01 22:54:57 +09:30
Zuhayr
1bd8b7baf0 Added citizenship, faction, religion and home system to character generation. 2014-08-01 22:05:38 +09:30
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
Whitellama
0a0c18dbf6 Fixed issue with flavour text saving/loading from other characters 2014-07-26 18:50:34 -07:00
Chinsky
5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix 
Added check for blank on name entry
 2014-07-27 05:04:05 +04:00
Whitellama
eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
JimTheCactus
0b7e858000 Changes check to an isnull rather than a truth test 
This allows the client to detect the difference between a blank and someone pressing cancel.
 2014-07-26 16:19:14 -06:00
DJSnapshot
d4ce124fe0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-07-25 19:37:10 -07:00
DJSnapshot
9be6de1e77 fixes admin show-skills verb. 2014-07-25 19:34:13 -07:00
JimTheCactus
b0db2ba347 Added check for blank on name entry 
Since cancel just returns a blank this checks for that and doesn't raise an error.
 2014-07-25 19:36:58 -06:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
DJSnapshot
2c7bb6c48d Remerged Siik'maas and siik'tajr together as per the tajara maintainer's request. 2014-07-24 17:01:52 -07:00
DJSnapshot
f8d478fcbb Updates to gun targeting UI. Fixes #5710 2014-07-23 20:51:58 -07:00
Zuhayr
6981ca52f4 Trying to fix the loadout spawn issue, at least this will make it more informative. 2014-07-12 10:35:31 +09:30
Zuhayr
3955edd04b Final touches for loadout system. 2014-07-11 12:16:08 +09:30
Zuhayr
903679bd79 More work on gear loadouts. 2014-07-11 11:47:53 +09:30
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
GinjaNinja32
d389466c8a Fix Change UI verb 2014-07-05 21:28:11 +01:00
Zuhayr
4367d37332 Somehow when I added spawnpoints I put them in the wrong place. Moved the file. 2014-07-01 01:04:19 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
mwerezak
03648c220e Adds workaround for PHP whitelist 
Apparently there's some PHP script that needs to be updated or
something. Revert this once that is done.
 2014-06-28 12:19:57 -04:00
Zuhayr
515e78f760 First pass on custom loadouts. 2014-06-25 15:47:38 +09:30
Zuhayr
abc07e435c Minor formatting fix. 2014-06-24 13:41:59 +09:30
Zuhayr
96bbe1d9db Added spawnpoint datum, moved existing latejoin spawn to datum setup. 2014-06-24 13:33:48 +09:30
Hubblenaut
1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
mwerezak
87dfeab0f3 Adds secondary languages for species 2014-05-22 16:17:52 -04:00
Chinsky
5b761f5207 Merge pull request #5011 from DJSnapshot/hotfix 
Forgot I would need a null check.
 2014-05-17 08:29:16 +04:00
DJSnapshot
56e3d0a37f Forgot I would need a null check. 2014-05-16 21:26:08 -07:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Argent
2d99a65cdf Merge remote-tracking branch 'upstream/master' into dev 2014-05-08 19:27:02 +01:00