cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,723 Commits 6 Branches 0 Tags
fa92cdeeda4574b494d1dbdbb59ae50f50c14c37
Commit Graph

170 Commits

Author SHA1 Message Date
GinjaNinja32
12bc3aa0ff Rewrite english_list to be a little nicer on lists of objects, and also faster 2016-08-15 17:31:10 +01:00
SinTwo
b42d46205f more time proc call fixes 2016-07-30 17:39:47 -04:00
PsiOmegaDelta
d2b4db716d Ports Paradise's 510 scheduler. 
Conflicts:
	code/__defines/btime.dm
	code/__defines/process_scheduler.dm
	code/_helpers/time.dm
	code/controllers/ProcessScheduler/core/_stubs.dm
	code/controllers/ProcessScheduler/core/processScheduler.dm
	polaris.dme
 2016-07-27 17:20:37 -04:00
comma
2fc033ee0e Ports /vg/ get_turf 
Gotta go faster.
Possibly undocumented behaviour of get_step?
 2016-07-23 18:00:50 +01:00
Yoshax
e28c4361f7 Merge pull request #2015 from Neerti/12/16/2015_newwizard 
Dry-dock phase for Technomancer
 2016-07-10 03:43:35 +01:00
PsiOmegaDelta
60593ce024 Bay-tweaks. 
Ultra dynamic MedHUD states.
 2016-07-10 03:14:22 +01:00
PsiOmegaDelta
8e82e70056 Makes the medHUD smoother. 
It now has more stages, giving the viewer a little more detail about how badly you're doing.
Port of https://github.com/ParadiseSS13/Paradise/pull/4726.
 2016-07-10 03:13:20 +01:00
PsiOmegaDelta
691349864b Adds variety to the critical MedHUD states 
Makes it easier to prioritize who will receive treatment.
Port of https://github.com/tgstation/tgstation/pull/17279.
 2016-07-10 03:13:05 +01:00
Neerti
20a3bd5b26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-06-26 20:14:29 -04:00
Neerti
53d60eb554 Does even more work. 
NOTE: asphyxiation is broken!
 2016-06-23 05:21:04 -04:00
Yoshax
fff26d1289 Fixes GRC to make it not shit 2016-06-13 20:20:17 +01:00
Arokha Sieyes
7b4d571889 Makes communicators great again 2016-06-11 22:05:01 -04:00
Arokha Sieyes
3cb7395279 Rearranges get_mobs_and_objs_in_view_fast 
Also adds the ability to select between ghost eyes and ears.
 2016-06-11 21:52:52 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
EmperorJon
5a545854a4 Underwear Datums (#1794) 
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
 2016-05-29 17:29:36 +01:00
Yoshax
288ae3d274 Merge pull request #1796 from VOREStation/realisticfbp 
The Terminator Update
 2016-05-29 15:56:22 +01:00
Jon
21f898e047 First commit of manual port of BS12 
#13042
and
#13086
 2016-05-29 00:56:11 +01:00
Ccomp5950
7277885c73 Couple of optimizations to get_mobs_and_objs_in_view_fast() 2016-05-28 13:54:10 -04:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	code/modules/mob/living/say.dm
 2016-05-26 08:20:41 -04:00
HarpyEagle
2aa0e29ae6 Fixes get_turf() runtime 2016-05-25 15:19:58 -04:00
HarpyEagle
dd9082f903 get_turf optimization 
Checks isturf() and then locs instead of looping
 2016-05-25 14:15:31 -04:00
Ccomp5950
3f2c95cfff Merge d3081d97ac3bd438fb2331b5aaeb40dadeaf5049 2016-05-25 00:05:37 -04:00
Datraen
bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
 2016-05-19 17:31:25 -04:00
EmperorJon
56c286c073 Merge pull request #1671 from VOREStation/namedefines 
Generic Station & System Name
 2016-05-16 21:44:53 +01:00
Arokha Sieyes
8e90199052 Generic Station & System Name 
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
 2016-05-16 15:34:03 -04:00
Leshana
e0a77f7d2f Fix the letter ÿ in nano-ui displays 
* Particularly noticable on the cartridge button of the PDA, any time we transmit a name containing \improper or \proper using nanoui it shows up as ÿ
* This is becuase BYOND internally handles these escapes by simply using character 0xFF etc.
* We'd better strip them out before sending them as JSON data so they aren't rendered as ÿ when treated as utf-8 encoding.
 2016-05-14 23:26:15 -04:00
Datraen
3d9435c9b3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
 2016-05-12 17:24:55 -04:00
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Datraen
44edf86ccb Merge pull request #1455 from Yoshax/gendertweak 
Gender tweaks and adjustments
 2016-05-05 10:18:25 -04:00
Hubblenaut
9338f770f8 Ninja fixes and changes (#1547) 2016-05-04 13:45:25 -04:00
Datraen
f09304c508 Adds the new xeno mob system, implemented with slimes. 2016-04-21 11:05:18 -04:00
Yoshax
aa592e3b35 Gender tweaking 
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
 2016-04-20 20:07:14 +01:00
Yoshax
0577738032 Character setup gender selection changes 
Different species now have different gender selections available.
 2016-04-20 16:27:55 +01:00
Yoshax
26192e2b32 Fixes an error 2016-04-20 15:36:13 +01:00
PsiOmegaDelta
a3f8bc815e Round start timer now remains at 0 until the round actually starts. 2016-04-20 15:27:59 +01:00
Neerti
3667780871 Adds verb to change eye color at will (if mechanical) 
Adds a verb used by humanoid mobs that have mechanical eyes, which allows them to pick a new color, and have it applied instantly.
Adds some helper functions, specifically hex2rgb(), to convert hexadecimal colors to a list of numbers for r, g, and b.
 2016-04-16 06:14:09 -04:00
PsiOmegaDelta
4286cd959e Resist tweaks. 
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
 2016-04-12 02:01:50 +01:00
woodratt
ab49ae802a 1.5.0 Striped Socks 
- Added green, purple, blue, yellow, red, and orange striped socks. Thigh and knee high options.
 2016-04-09 15:20:37 -07:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code. 
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
 2016-04-08 23:07:10 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests 
Ports unit tests
 2016-04-04 10:34:12 -04:00
Neerti
983192bf11 Merge pull request #1315 from Datraen/PrefVerbsPerms 
Updates Preference Permissions, Re-adds Verbs
 2016-04-01 16:53:52 -04:00
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer 
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
 2016-03-31 16:10:07 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Kelenius
c8b510b415 Adds unit tests 
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
 2016-03-29 17:42:22 +03:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Yoshax
bae4900fc0 Shortens the in-hand check 2016-03-21 17:24:55 +00:00