cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,615 Commits 10 Branches 0 Tags
7c75e591cd664d9923ac6436e59a363c6c6777a6
Commit Graph

12340 Commits

Author SHA1 Message Date
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
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
Ccomp5950
8106b6a4ae Code Effeciency project: Damn monkies Life() 
pretty much the same effeciencies from human/life()

no need to updatehealth() over and over and over
no need to process environment if everything is normal
etc.
 2014-03-22 06:56:09 -05:00
Ccomp5950
ce83c5c64e Code effeciency project: handle_environment (human/life()) 
Before:  We process a whole lot of bullshit for no real reason most of the time because temperatures are perfect.

Now:	 We check if our temperatures and environment are within normal bounds and get the hell out of the proc.

Also:    Mobs that are long dead or just dead mobs spawned at round start won't process Life(), those 3 clowns don't need Life(), those jerks.
 2014-03-22 06:22:01 -05:00
Ccomp5950
f1506acf1e Code effeciency project: Handle_Organs (human/life()) 
We do a bit of pre-processing to see if we want to do checks on all the organs.

First we don't even do preprocessing unless we have damage of some kind
afterwards we process what is hurt until it gets better or overall we get worse
when we go ahead and check everything else out again.

Can add a safety check in life every 30 ticks or so go ahead and check every organ again but I don't think it's needed.
 2014-03-22 04:33:48 -05:00
Ccomp5950
62db2723dd Merge pull request #4614 from LightningIron/master 
Added Alden-Saraspova counters to excavation closets.
 2014-03-22 02:07:58 -05:00
Ccomp5950
0e369578cc VV drop down menu to resend NanoUI resource files. 
Some players are having issues with NanoUI not opening up or acting funny
before the only fix was to have them log out, and log back in, check if that worked.
If not log out, delete cache log back in, if that don't work not much can be done.

Now we just skip the whole logout login thing and force the server to send the files
to their client once again skipping the need for their character to take a dirtnap for a moment.
 2014-03-21 23:03:06 -05:00
LightningIron
37a4b9e7da Added Alden-Saraspova counters to excavation closets; item previously unobtainable. 2014-03-21 15:24:19 -05:00
Aryn
fc49951f77 Reduced six-state lighting to five-state, removed debug verbs. 
Not a big drop in quality, but reduces the states used by half.
 2014-03-21 06:05:05 -06:00
Ccomp5950
731f08eb10 Rejuvination verb fix for IPC's limbs don't suddenly become organic. 2014-03-20 20:31:33 -05:00
Ccomp5950
5dbc141b9b IPC examination won't cause "OH NO ROBOTIC LIMBS" (no shit, yo!) messages. 
Unless they are damaged.
 2014-03-20 20:15:02 -05:00
Jim "Apples"
ae2c398b26 Merge pull request #4611 from Aryn/to-master 
Ctrl-H "faggot" to "meatball" and one icon state change.
 2014-03-20 11:22:37 +00:00
Aryn
de86280434 Ctrl-H "faggot" to "meatball" and one icon state change. 2014-03-20 05:05:23 -06:00