cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 6 Branches 0 Tags
d7650f55ea65bc3b3b89b51f564749faee530e23
Commit Graph

602 Commits

Author SHA1 Message Date
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
Mloc
f04ca77bfb revert chargen rendering rework 
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-08-01 11:35:53 +01:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master 
Dev-freeze
 2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7 Emergency workaround for the observer bug. 2015-07-09 11:01:42 +09:30
Chinsky
9d03286b6c Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon. 2015-06-25 23:04:33 +03:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master 
Dev-freeze
 2015-06-08 09:56:24 +02:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles. 
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
 2015-06-07 12:31:55 -04:00
Chinsky
c62958fc89 Fixes #9336 2015-05-18 07:58:41 +03:00
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Chinsky
a6ecdedf74 Fix for being forever tajaran 2015-05-12 07:48:54 +03:00
Chinsky
495783de59 As per Ginja's suggestion, dummies are now used one per prefs datum. 
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
 2015-05-12 07:24:25 +03:00
Chinsky
86c8c8c52b Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart. 
Also fixed a runtime, somehow head was created without a tajaran and got lost.
 2015-05-12 06:42:08 +03:00
Chinsky
5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
 2015-05-12 06:04:22 +03:00
Chinsky
29823e3552 Changed update_preview_icon to use a human dolly to get all those icons instead of... old way. 
I guess it's more hacky, but fairly shorter and means you don't need to touch that... thing when you add a new job/change existing loadout.
Also changed preference transfer to use appearance procs to properly sync with organ colors.
 2015-05-12 05:55:49 +03:00
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
 2015-05-11 09:28:59 +02:00
PsiOmega
783e437c5e Enforces antagHUD restrictions. 
antagHUD checks were missing in a few places.
Can no longer join as drone, ERT member, or pAI if you have enabled antagHUD.
 2015-05-07 09:55:26 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
Zuhayr
a3ed7fc033 Should fix the head and hair issues from the organ rewrite. 2015-04-03 05:41:33 -07:00
Zuhayr
84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
mwerezak
ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
PsiOmega
00becda446 Few Fixes. 
Fixes #8304.
Fixes #8306.
 2015-02-28 14:29:30 +01:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Chinsky
3f8462a399 Adds a wardrobe structure to pick your underwear. 
Adds ability to wear female underwear as male and vice versa.
Changes 'underwear'/'undershirt' vars to hold iconstate instead of esoteric dances with array indexes.
 2015-02-16 11:17:22 +03:00
GinjaNinja32
6ea6c82897 AI latejoin 2015-02-02 17:59:57 +00:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
PsiOmega
c587c4d8b0 Ready-button consistency. 
The Ready/Not Ready options during round now always set the ready flag as according to their name, rather than always toggle.
This prevents the case where (due to heavy load/no processing of dialogs during early client startup) the dialog claim one thing and the lobby status tab another.
 2014-12-11 08:44:56 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Chinsky
366badb706 Merge pull request #7165 from PsiOmegaDelta/Joining 
Late-Join Name Addition.
 2014-11-30 00:56:42 +03:00
PsiOmega
2f739975db Late-Join Name Addition. 
When late-joining the name of the currently loaded slot is shown at the top of the job selection screen.
 2014-11-28 20:31:26 +01:00
Amunak
93859e9652 Dead chat will get announcements when someone joins or leaves it. 
This is mainly for wizard and cult rounds, where it is important to know that a wizard/cultist is watching. The announcement was added for most other types of leaving/joining the ghost realm. Admin ghost doesn't get announced for obvious reasons.
 2014-11-28 13:05:26 +01:00
Amunak
3e6ebe5d4c Main menu should now be big enough to not display a scrollbar. 2014-11-28 10:12:52 +01:00
Amunak
9103b98982 Cosmetic changes to the menu ready button. 
It works like a toggle switch now.
 2014-11-28 10:11:32 +01:00
mwerezak
e6b5d4cf77 Skrell icon/appearance changes 
Adds desaturated skrell body and hair sprites, fixed colour skrell eyes,
and blood colour as requested by Searif.
 2014-11-20 13:10:42 -05:00
GinjaNinja32
d10311befd Adds cyborg-only latejoin spawnpoint 2014-11-14 23:38:09 +00:00
GinjaNinja32
a725526e4a Fix cyborg latejoining, allow mid-round joining 2014-11-14 23:38:08 +00:00
GinjaNinja32
c5bba7f3a5 Re-move resource update 2014-10-20 17:26:55 +01:00
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30