cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,064 Commits 10 Branches 0 Tags
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

507 Commits

Author SHA1 Message Date
Segrain
fcc4560e92 Displaying delayed time. 2014-02-03 04:38:38 +03:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs 
Character setup underwear rendering
 2014-02-01 14:58:38 -08:00
Chinsky
3a913e426c Merge pull request #4360 from RKF45/dev 
I am doing that just for genetecists wearing monkey suits.
 2014-02-01 03:33:54 -08:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm
 2014-02-01 17:53:13 +13:00
RKF45
2be33b8713 Typo 2014-01-31 08:36:56 +01:00
RKF45
003dd117f2 New preferences 2014-01-30 22:27:47 +01:00
Zuhayr
ae7ae5a837 IPC hairstyles. 2014-01-28 15:58:26 +10:30
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband. 
Fixes #4143
 2014-01-08 22:15:47 -07:00
Zuhayr
2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
fauxki
28340d01ab #4108 - mispelling was preventing it from showing up. 2013-12-23 14:53:46 -08:00
fauxki
05f012b486 Added in the Longer Hair that was removed in the TG merge under the new name of Flaired hair because to many hairstyles start with long. 2013-12-20 01:28:47 -08:00
Rob Nelson
53c2aff420 DNA2 - A recode of DNA 
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
 2013-12-01 00:04:27 -08:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
jack-fractal
5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
 2013-11-22 20:30:23 -05:00
jack-fractal
3eb8d1c2b9 - lots of debugging 
- modifying how runes are called to use reflection
- adding highlander code to make sure that there can only be one mask
- adding Spread Shadows spell
- adding cult admin investigation log
- adding mask icon
 2013-11-22 20:09:24 -05:00
Ccomp5950
7be20c0986 AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options. 
Poor guys won't know what they are missing!

Admins/Mods will still have the verb viewable.
 2013-11-19 05:36:40 -06:00
Nanai
6eccd98d16 5 New Hairstyles! 
Fully done insofar, these new hairstyles are Gentle, Long Braid, and Side Ponytail for humans. Tajara Bangs, and Tajara braid for Tajaran.
 2013-11-14 12:40:32 -05:00
Nanai
a909ceccc9 Additional Hairstyles! 
Two human hairstyles: Gentle, and Side Ponytail, and two new Tajaran hairstyles, Bangs and Braid.
 2013-11-14 12:40:02 -05:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Chinsky
7c681b2bd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mob/new_player/new_player.dm
 2013-10-15 10:56:50 +04:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts 
Fancy ghosts!
 2013-10-10 03:06:40 -07:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
463adc446f Fancy ghosts! 
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
 2013-10-06 16:10:47 +04:00
Zuhayr
b0d7a95189 Merge pull request #3644 from DJSnapshot/master 
Gave mods dsay command and unique dsay identifier
 2013-09-03 22:46:39 -07:00
Zuhayr
9565c94955 Secondary language fix. 2013-08-27 00:10:00 -07:00
DJSnapshot
97af25119c Removed unnecessary second check. 2013-08-23 07:09:40 -07:00
DJSnapshot
a33a70fb92 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-23 06:45:23 -07:00
DJSnapshot
2525f4f8aa Moved hide_mode vars to global ticker instance. 2013-08-23 06:38:22 -07:00
DJSnapshot
7265509b1d Added vars to change hide mode. 2013-08-23 06:22:07 -07:00
DJSnapshot
4bd67e83b8 Changed vote settings to game mode votes other than extended will not be announced. 2013-08-23 05:47:45 -07:00
Mloc
e20f2e1409 Small fixes to hair. 
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-22 15:12:59 +01:00
Erthilo
b6900d50fc Fixes admins not spawning as aliens on roundstart. 2013-08-20 14:20:33 +01:00
Erthilo
de6eb16e1a Fixes being able to have alien species hair on humans or other species. 2013-08-20 10:37:05 +01:00
Zuhayr
9e58d93fd6 Removing snowflake checks for Soghun. 2013-08-16 01:01:12 -07:00
Zuhayr
f6a562e8ed Couple of typos. 2013-08-14 09:47:52 -07:00
Zuhayr
e10a433800 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-14 01:01:18 -07:00
Zuhayr
82a4dedf5d Snowflake check for Soghun. FIX THE WHITELIST THING, HEAD. 2013-08-12 21:17:38 -07:00
Zuhayr
bc4ac1d4ee Language choice changes. 2013-08-10 21:00:15 -07:00
Zuhayr
69fd8da6db Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-10 18:30:27 -07:00
Zuhayr
9ee5d58ca6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-10 12:24:33 -07:00
Zuhayr
bb06b50177 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-09 13:21:54 -07:00
Zuhayr
e00e593988 Removed hair option with missing sprite. 2013-08-09 13:16:47 -07:00
Zuhayr
cfc7dc73d9 Merge pull request #3465 from DJSnapshot/new_player 
Changes to new_player.dm
 2013-08-08 16:08:31 -07:00
DJSnapshot
0feea48cf8 Changed observe button warning to reflect 30 minute wait time. 2013-08-08 14:32:44 -07:00
Zuhayr
b5d89b8929 Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn. 2013-08-07 01:16:38 -07:00
Zuhayr
98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
Zuhayr
b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00