cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,881 Commits 7 Branches 0 Tags
fe4f9b0df92a75e16f7a9de8cdfbe73ca1385ad2
Commit Graph

12523 Commits

Author SHA1 Message Date
SparklySheep
c355a30cf6 Removes E-bow Instant Stun. Slight tox buff. 
The E-bow with the stun is currently the most powerful weapon in the game. Stuns on hit, causes immediate damage, unlimited ammo with recharge, and the stun is not affected by armor. You can viably stunlock someone to death just by occasionally shooting them without running out of ammo. Horrible design and it warrants an immediate removal until I finish my E-bow changes later.
 2014-04-10 14:41:37 -05:00
Ccomp5950
6056b5dc3d Some fixes saycode cleanups 
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
 2014-04-10 00:05:52 -05:00
Iamgoofball
7b1f8a9994 changes attack hand to return 2014-04-09 14:07:16 -07:00
Ccomp5950
5698c135bc Merge pull request #4729 from Ravensdale/genetics 
Disable Genetics
 2014-04-09 13:32:58 -05:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Chinsky
e237c03b30 Merge pull request #4710 from RavingManiac/master 
Tape recorders work in closets and containers
 2014-04-09 21:44:22 +04:00
Jarcolr
5ca99dabe7 Adds an additional \ 2014-04-09 14:06:52 +03:00
Ravensdale
d28cf40f5d Disabling of Genetics 2014-04-09 01:28:38 -07:00
Ccomp5950
46704a436b Saycode rewrite: Add support for speech_problem_flag 
Ready for Dev
 2014-04-08 21:50:01 -05:00
Jarcolr
ecde9b50b0 Thy does not equal They 
Of course,I make a mistake in my PR for fixing typos.
 2014-04-08 14:59:50 +03:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
SparklySheep
341f8570e4 Changeling Rebalances 
As discussed here: http://www.baystation12.net/forums/viewtopic.php?f=5&t=10001
 2014-04-07 14:34:27 -05:00
Mloc-Argent
9b19d7dacf atmos: remove a few force-deletes in merge code 
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-07 17:28:09 +01:00
RavingManiac
ac9d37261f Check restricted to closets and storage items due to lag concerns. 2014-04-07 20:45:05 +08:00
RavingManiac
795df2b2c9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-07 20:18:20 +08:00
Ccomp5950
82d4d3a497 Merge pull request #4712 from Jarcolr/kilo 
Fix for #4701 and immersion
 2014-04-07 02:20:55 -05:00
Ccomp5950
e1fef1796e Merge pull request #4707 from DJSnapshot/tasers 
replaced electrodes with insta hit taser beams
 2014-04-07 02:16:01 -05:00
Ccomp5950
80bae7a87d Merge pull request #4705 from DJSnapshot/jumpsuits 
Undershirts and rolling down jumpsuits!
 2014-04-07 02:12:59 -05:00
Ccomp5950
9fb43f2333 Merge pull request #4706 from DJSnapshot/papers 
Carbonless copy papers
 2014-04-07 02:12:10 -05:00
DJSnapshot
d96fc4a057 Merge pull request #4704 from Jarcolr/patch-1 
Fix for #4681
 2014-04-06 18:33:51 -07:00
DJSnapshot
86d273e25e DEBUG TEXT, WOO 2014-04-06 18:31:33 -07:00
DJSnapshot
36b2efd3df disregard failure. I made a silly. 2014-04-06 18:29:50 -07:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
Chinsky
4ee7569858 Merge pull request #4694 from mwerezak/master 
Fixes #4689, #4680
 2014-04-06 22:12:08 +04:00
Chinsky
5300508fc2 Merge pull request #4702 from Jarcolr/patch-2 
Kicking a grille does 2 less damage; fix for #4557
 2014-04-06 22:11:43 +04:00
Jarcolr
b83e0f2ad7 Adds additional text to lighting 2014-04-06 13:24:44 +03:00
Jarcolr
b6ee8a62b0 Fix for 4601 and immersion 
Premium Cigar now understands being lit,and the corn cob pipe/ cigars
now no longer refuse being hit by fire.
 2014-04-06 12:43:58 +03:00
RavingManiac
f0bda5a494 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-04-06 14:28:28 +08:00
RavingManiac
e348f532ab Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets. 2014-04-06 14:20:57 +08:00
Ccomp5950
5933496ad0 Merge pull request #4696 from Jarcolr/epsilon 
Removes unfat sting from changeling evolution menu
 2014-04-06 00:16:42 -05:00
Ccomp5950
9d291b79ea Merge pull request #4695 from mwerezak/dev 
Made single cable pieces have w_class = 1
 2014-04-06 00:16:06 -05:00
DJSnapshot
1a50dddbd4 replaced electrodes with insta hit taser beams. 2014-04-05 17:13:09 -07:00
DJSnapshot
772edffad1 Merge pull request #4700 from Jarcolr/diction 
Spaghetti isn't called spagetti anymore
 2014-04-05 17:05:06 -07:00
DJSnapshot
61036e529e Merge pull request #4692 from Hubblenaut/master 
Renamed paperwork no longer has 'paper -' in name
 2014-04-05 17:03:48 -07:00
DJSnapshot
4ea07e2617 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers 2014-04-05 16:24:56 -07:00
DJSnapshot
7b7f3bcfc0 Undershirts and rolling down jumpsuits! 2014-04-05 16:18:11 -07:00
Jarcolr
31f935413e Fix for #4681 
#nerftele2014
 2014-04-05 23:27:07 +03:00
Jarcolr
a3bf9733a2 Kicking a grille does 2 less damage; fix for #4557 
It will now take 10 hits to destroy it without using a weapon or tools.

Take that,metagamers!
 2014-04-05 19:15:41 +03:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2 
A first pass at more realistic w_class values
 2014-04-05 16:23:59 +01:00
Jarcolr
bec699bb7c Spaghetti isn't called spagetti anymore 
Didn't change the code/vars/recipes; just fixed the Name line to the
proper spelling.
 2014-04-05 18:13:19 +03:00
Jarcolr
925cb02ef7 Removes useless unfat sting from evolution menu 
Also fixed a typo; but meh.

No point in having to use points on something that has no use.
 2014-04-05 10:20:54 +03:00
Mike
fa1fd3cb24 Made single cable pieces have w_class = 1 
Single cable pieces have w_class = 1 and can be tucked behind the ear.
 2014-04-05 01:21:30 -04:00
Mike
920a08412b Fixes #4689 
Rods can't break reinforced windows.
 2014-04-05 00:38:48 -04:00
Hubblenaut
0b29f83444 Renamed paperwork no longer has 'paper -' in name 2014-04-04 22:18:08 +02:00
Ccomp5950
753a2ef08c Code Effeciency Project: Vent scrubbers have a bit more sanity. 
No longer checking for 0.00000000000000000000000001 moles of toxins scrubers can only detect stuff worse then 0.001 moles.

Have a nice day.
 2014-04-04 13:21:47 -05:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
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