cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,653 Commits 7 Branches 0 Tags
8ccce503a99ea201ef7badcb8317af1b60b91f13
Commit Graph

3555 Commits

Author SHA1 Message Date
Loganbacca
e05b5c0bfb Pipe rendering rewrite 
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
 2014-07-18 13:39:39 +00:00
Mloc-Hibernia
51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl
 2014-07-18 13:15:30 +00:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
Mloc
ae9d75bd5e Merge pull request #5664 from Zuhayr/pais 
Mobile pAIs.
 2014-07-18 14:07:11 +01:00
Zuhayr
1345ee5a5c Initial commit for mobile pAIs. Almost guaranteed to be broken as shit. 2014-07-17 23:09:47 +09:30
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
1a52aa7b06 Merge remote-tracking branch 'upstream/dev' into op-hideout 2014-07-16 17:41:30 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Zuhayr
f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr
f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Atlantiscze
db18074f90 Designed to replace AI's intercoms. Integrated headset-like device which has access to all department frequencies. Also let's AIs use radio on intellicard. 
AI's communication can however be disabled by using intellicard option. Communication will be disabled until it is restored via intellicard again,
even if the AI is moved back into physical core. ICly it's software lock which prevents the AI from using communication circuits which are standard in all
AI cores/intellicards/etc. This does not stop AI from using intercom, however.

 Forum link: http://baystation12.net/forums/viewtopic.php?f=5&t=6536&start=1260
 2014-07-16 00:54:54 +02:00
Hubblenaut
4ee6b77289 Adds new syndicate closet and adjusts nuke setup 2014-07-15 17:22:03 +02:00
mwerezak
f2845dbe76 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.
 2014-07-15 01:14:04 -04:00
Zuhayr
d050f0a30b Merge pull request #5620 from Decius-R/loyalty_implants 
Loyalty Implants
 2014-07-15 10:30:48 +09:30
Decius-R
8d8e3f43d4 Fixed a small mistake.. 
Forgot to remove where I was going to originally make a proc. Didn't see it at skim through. Fixed.
 2014-07-14 19:14:38 -04:00
Decius
0b314561ca Now allows admin override via player panel, a small fix, and... 
implantation works again. Since they'll only be accessible via an admin
specifically spawning it, except for in cases where it is configured
to be allowed, it'll be fine.

This now allows admins to incorporate loyalty implants still if they so
wish for whatever reason, but it is normally inaccessible.

Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 19:02:21 -04:00
Mloc
48cea3dbb3 Merge pull request #5578 from Faerdan/dev 
NanoUI Update
 2014-07-14 23:35:49 +01:00
Decius
b37ce454df Removed from map + made implanters conform to configuration... 
Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 18:02:04 -04:00
Decius
203c36114d Made spawning with a loyalty implant compliant to configuration... 
Created a proc for being implanted with loyalty implant which
checks for the configuration for whether or not it will work. If it is
enabled, it continues on-- if it is disabled, it returns from the proc.

Also made secure closets not automatically spawn them unless the config
is set to allow it.

Admin 'loyalty implanting' via the panel is now compliant to the
configuration file. If preferred, I am willing to make an override variable
to the proc that will allow admins to do it anyway.

Supply pack for it commented out due to inability to make it conform.
Easy enough to re-add back for anyone downstream if they wish it. Same
applies to the design.


Signed-off-by: Decius <deciusreln97@gmail.com>
 2014-07-14 17:21:11 -04:00
Chinsky
d59e5b8da2 Merge pull request #5603 from DJSnapshot/hotfix 
Changing URL of Corporate Regulations to the new Corporate Regulations
 2014-07-14 07:12:37 +04:00
Zuhayr
5f8723352d Merging robot_modules.dm and master controller setup. 2014-07-14 09:10:02 +09:30
DJSnapshot
743ac61155 Little Slip-up 2014-07-13 13:30:36 -07:00
DJSnapshot
5063178aa6 Changed URL to Corporate Regulations 2014-07-13 13:29:19 -07:00
Kelenius
aad89409de Slime update 2014-07-13 17:37:30 +04:00
Chinsky
4e371f7af7 Merge pull request #5585 from SparklySheep/patch-3 
Fuk da law
 2014-07-13 08:56:54 +04:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
SparklySheep
55c7fbe739 Changes Space Law book to Corporate Regulations 
Because fuck anyone that thinks "Space Law" is a good name for a roleplaying server.
 2014-07-12 10:26:54 -05:00
Mark Aherne
aaa5ad1002 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-07-12 00:42:06 +01:00
Mark Aherne
6c12d62285 Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev 2014-07-11 10:53:08 +01:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Ccomp5950
e44bcf81fe Merge pull request #5559 from Walter0o/deadly_fork_fix 
deadly sharp w_class 1 fix
 2014-07-10 23:40:25 -05:00
Zuhayr
0d21889bee Fixed some bugs, did some testing, moved some procs around for robot functionality. 2014-07-11 13:50:34 +09:30
Zuhayr
70ba371658 Merge resolution. 2014-07-11 12:47:16 +09:30
Walter0o
5289776e33 removes sharpness from forks 
too commonly available to enjoy the sharp bonus.
 2014-07-10 19:47:59 +02:00
DJSnapshot
eacd384d39 Merge pull request #5554 from Baystation12/master 
Updating dev with master
 2014-07-09 23:00:04 -07:00
Jim the Cactus
c984385adb Merge branch 'master' of https://github.com/baystation12/baystation12 2014-07-09 14:53:16 -06:00
Zuhayr
f477012ab8 Merge pull request #5533 from mwerezak/wound-infections 
Fix for #5532 and the last of the infection changes, I hope
 2014-07-09 19:28:00 +09:30
Mloc
c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master 
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
 2014-07-09 10:41:22 +01:00
mwerezak
910ce676b0 Fixes advanced trauma kits claiming to disinfect but not doing so 2014-07-08 18:49:51 -04:00
John-Michael O'Brien
0e1d549ff1 Update PDA.dm 
Patched the comment to match the actual, final behavior (Doh!)
 2014-07-07 22:57:37 -06:00
Hubblenaut
6f1759a7aa Fixes me being dumb with renaming variables 2014-07-08 03:07:22 +02:00
Hubblenaut
38ac5ece7c Health Analyzer can read all types of beneficial medicine 2014-07-08 02:09:53 +02:00
Mloc-Argent
64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-07-06 17:50:53 +01:00
JimTheCactus
da6ff0a251 Patched PDA scanner to be more useful 
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
 2014-07-05 19:55:23 -06:00
Zuhayr
21e625d89b Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 2014-07-05 16:48:59 +09:30
Zuhayr
34d19d16f5 Fffffff fixes crates not budging properly. 2014-07-05 04:17:12 +09:30
Zuhayr
67da4096b3 Fixes #5461 2014-07-04 17:48:01 +09:30
Zuhayr
0c11ebe8e8 Fixes #5490 2014-07-04 17:39:45 +09:30
Chinsky
5724a77cdb Merge pull request #5474 from Zuhayr/master 
Fixes climbing through shutters.
 2014-07-03 20:38:56 +04:00
Zuhayr
07acb270d1 Merge pull request #5476 from Hubblenaut/wheelchair 
Wheelchair Fixes
 2014-07-03 13:16:14 +09:30