cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,724 Commits 5 Branches 0 Tags
10e76d9762e4f26a690be916d36da42da64b85f9
Commit Graph

12405 Commits

Author SHA1 Message Date
DJSnapshot
0affa39490 initial CC paper commit. Will continue work on this. 2014-03-30 16:41:06 -07:00
Ccomp5950
04aec7b885 Merge pull request #4651 from Jarcolr/patch-1 
Added more value to misc. supply crates
 2014-03-30 17:29:49 -05:00
Ccomp5950
da722fd8f6 Merge pull request #4648 from GinjaNinja32/master 
Add colour to AI private channel (144.7)
 2014-03-30 13:46:13 -05:00
RavingManiac
b8e27c1347 Missing files added. 2014-03-30 21:51:20 +08:00
RavingManiac
7c75e591cd Inflatable barrier boxes added to engineering. Inflatable barrier crates can be ordered by the QM. Briefcase icon_state fixed. 2014-03-30 21:41:13 +08:00
Ccomp5950
bf7684bced Lagsie no more, NarSie HUNGERS 
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)
 2014-03-30 03:15:20 -05:00
Ccomp5950
9915d28fb1 Removal of last debug message and making players be able to use languages over general comms 
;:k = skrell speak over general comms for example.
 2014-03-30 01:10:02 -05:00
Graham Lloyd
f176b2dea9 I can feel the hugs already. 2014-03-30 00:49:23 -04:00
Ccomp5950
e23530e31c Say code rewrite, Silicon jerks now using new saycode. 
Tracking added for AI's and Observers

Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()

removed a bunch of my debug verbs.
 2014-03-29 23:28:47 -05:00
Jarcolr
6568f4acfd Added more value to misc supply crates 
Your junk is even more junk-ish now!
 2014-03-30 00:13:56 +02:00
Ccomp5950
12b5db483e Oversight, miners can now bump mine boulders just like the rock around them. 
Screw you xenoarch code, screw you.
 2014-03-29 16:07:47 -05:00
Ccomp5950
02ba14ea8b Merge pull request #4645 from Jarcolr/patch-1 
Potato in processor doesn't instantly transform into fries anymore
 2014-03-29 15:04:51 -05:00
GinjaNinja32
5836931a17 Add colour to AI private channel (144.7) 
Changes the AI private channel colour to magenta (#ff00ff), and changes
the marker from [144.7] to [AI Private].

Magenta is far enough from the Science channel (#993399) to be obvious,
but I'm open to alternative suggestions.
 2014-03-29 18:22:36 +00:00
Ccomp5950
dc773f9e49 Merge pull request #4644 from Glloyd/3dsound 
3d Sound from /tg/
 2014-03-29 11:00:55 -05:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Ccomp5950
b5dfa3f08d Merge pull request #4642 from Furlucis/master 
AI firelock using fix
 2014-03-28 14:42:51 -05:00
Jarcolr
e3bc3ff64c Removed text that came from nowhere..? 
uhh..
 2014-03-28 21:14:31 +02:00
Jarcolr
aae897f48f Potato in processor doesn't transform into fries anymore 
What it says on the tin. Fixes issue discussed in #4596.
 2014-03-28 20:55:10 +02:00
Graham Lloyd
b6f2d39f6b 3d Sound from /tg/ 2014-03-27 14:49:49 -04:00
Chinsky
581cc2bfea Merge pull request #4640 from Glloyd/holo2 
Fixes Holodeck exploits (Fixed)
 2014-03-27 15:13:02 +03:00
Chinsky
60b6daadee Merge pull request #4641 from Ccomp5950/log_fix 
*NIX Log files part 2.
 2014-03-27 15:12:19 +03:00
Chinsky
896ef5970b Merge pull request #4633 from MrLeebo/virology-fixes 
Virology - NanoUI, gameplay tweaks, bugfixes
 2014-03-27 15:10:35 +03:00
Furlucis
b83c99316c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-03-27 02:34:30 -04:00
Furlucis
ac923649eb Allows AIs to use hazardlocks 
I am absolutely certain that there is a better way to do this. Someone
else can do it, I'm just making it work.
 2014-03-27 02:16:38 -04:00
Ccomp5950
936db263ef *NIX Log files part 2. 
CR+LF added to new lines, created a global variable log_end that can be used
on newlines

log_misc("blahblah...[log_end]\nMoreblahblah[log_end]")

put [log_end] prior to any \n and it will show up correctly in windows.

Also created log_misc() proc to log to diary, and removed a bunch of

diary << stuff all over the place.
 2014-03-26 18:51:37 -05:00
Graham Lloyd
eb7baa787c Holorack 2014-03-26 19:14:39 -04:00
Ccomp5950
bee3d30baa Oops, broke Mesons when I fixed NVG's 
This should put things back where they go.
 2014-03-26 17:19:51 -05:00
Jeremy Liberman
bf6c3d3a24 Code review and remove baystation12.int from source control. 2014-03-25 22:17:02 -05:00
Chinsky
d6bb03943b Merge pull request #4626 from Iamgoofball/chambox 
Expanded on an old TG PR, Adds 9 new Chameleon items.
 2014-03-26 02:12:59 +03:00
iamgoofball
98264dc27e stop being a chemical container plzty 2014-03-25 16:11:40 -07:00
Chinsky
820b5e0d9b Merge pull request #4632 from Ccomp5950/apc_low_charge_fix 
Bugfix for new APC code, gridchecks won't just turn off equipment.
 2014-03-25 23:12:21 +03:00
Mloc
38a22e880f Merge pull request #4623 from Ccomp5950/bugfixes 
Bugfixes, Various
 2014-03-25 08:45:53 +00:00
Jeremy Liberman
16f787a1da Virology - NanoUI, gameplay tweaks, bugfixes 2014-03-24 23:55:41 -05:00
Ccomp5950
d6a9448535 Bugfix for new APC code, gridchecks won't just turn off equipment. 
Was a problem with me switching the order of the checks.
 2014-03-24 17:42:27 -05:00
Mloc-Hibernia
d4324901d3 Revert "Merge pull request #4478 from Aryn/master" 
This reverts commit 86941a58f0, reversing
changes made to 65b8215ec7.
 2014-03-24 13:55:41 +00:00
Mloc-Hibernia
34c39e773a Revert "Merge pull request #4513 from Aryn/master" 
This reverts commit fa88663c23, reversing
changes made to 608c48c6db.
 2014-03-24 13:55:23 +00:00
Mloc-Hibernia
1233e5568f Revert "Merge pull request #4541 from comma/dev" 
This reverts commit 596b6084e3, reversing
changes made to fa88663c23.
 2014-03-24 13:54:50 +00:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master" 
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
 2014-03-24 13:54:11 +00:00
iamgoofball
ebc0139140 fixes more issues 2014-03-23 20:53:27 -07:00
iamgoofball
a00a12aeb7 fixes issues pointed out in PR 2014-03-23 20:29:55 -07:00
iamgoofball
6fa4084d11 Adds 9 new Chameleon items. 
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
 2014-03-23 14:08:23 -07:00
Ccomp5950
e54ce881eb NVG Bugfix 
Now they work, and also added a green hud element that tints the screen green when nvg's are worn.
 2014-03-23 13:51:57 -05:00
Mloc
9d1ecdfbe8 Merge pull request #4618 from Ccomp5950/mob_controller_controlled 
Code Effeciency project:  mob_controller / human and monkey Life()
 2014-03-23 17:22:18 +00:00
Ccomp5950
0225d7b3b0 Bug fix 3: Now with a vengence. Monkey pockets cause scrolled chat. 
Added the check to see what you clicked in the inventory when clicking on pockets and added a message for it.  Now it won't just be a line break.

Fixes #4601
 2014-03-23 06:05:23 -05:00
Ccomp5950
d08bff84c9 Bugfix 2: Electric Boogaloo, Ninjas being tracked by AI's 
Removed AI's ability to track them sneaky ninja's.
 2014-03-23 05:43:18 -05:00
Ccomp5950
6fa08b233d Law office -> Internal Affairs in Area code. 
fixes #4577
 2014-03-23 04:44:06 -05:00
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems. 
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
 2014-03-23 02:26:06 -05:00
RKF45
8f9f0acec5 Give bees a chance. 2014-03-22 20:44:13 +01:00
RKF45
aa08abed18 Fix 2014-03-22 19:06:45 +01:00