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,643 Commits 10 Branches 0 Tags
72e45ebf7bfbdee01a8070d690023c3e80185f7c
Commit Graph

12351 Commits

Author SHA1 Message Date
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
13532e1ddd Merge pull request #4655 from RavingManiac/dev 
Inflatable walls and airlocks
 2014-04-03 13:31:39 -05:00
Ccomp5950
5f1c9317b2 Merge pull request #4679 from Glloyd/ear_stuff_1 
Lets people put penlights into their ears.
 2014-04-03 13:31:25 -05:00
RavingManiac
412467aa1e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-04-03 22:19:59 +08:00
Ccomp5950
a28243b054 Merge pull request #4676 from PsiOmegaDelta/MapFixes 
Map fixes - Tactical, central primary, medbay, telescience, and engine
 2014-04-02 23:41:16 -05:00
Graham Lloyd
b0fc611aca Lets people put penlights into their ears. 2014-04-01 16:36:58 -04:00
PsiOmega
af32a714ce Engineering EVA now its own area. 
Fixes #4671.
 2014-04-01 18:01:15 +02:00
PsiOmega
d025e4d2e3 The Tactic Equipment room is now its own area with APC, air alarm, and camera. 
Changed light source from bulb to light tube.
 2014-04-01 15:46:37 +02:00
Graham Lloyd
eae613d928 Fixes malf picking players to me malf who don't have BE_MALF toggled on. 2014-03-31 15:39:49 -04: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
Graham Lloyd
f176b2dea9 I can feel the hugs already. 2014-03-30 00:49:23 -04: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
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
Chinsky
6f8b599794 Merge pull request #4615 from Ccomp5950/nano_ui_admin_fix 
VV drop down menu to resend NanoUI resource files.
 2014-03-22 21:00:50 +03:00
RKF45
5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01:00
Ccomp5950
28392e9414 Code effeciency project: handle_virus_something() (human and monkey /Life()) 
2 for loops is more expensive then what we're doing here.
Also we check to see if virus2 is populated before starting a for loop
 2014-03-22 07:50:23 -05:00