cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,669 Commits 8 Branches 0 Tags
c355a30cf67d834b9e153ab479a829e54dd36c49
Commit Graph

12372 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
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
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
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
DJSnapshot
d96fc4a057 Merge pull request #4704 from Jarcolr/patch-1 
Fix for #4681
 2014-04-06 18:33:51 -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
DJSnapshot
772edffad1 Merge pull request #4700 from Jarcolr/diction 
Spaghetti isn't called spagetti anymore
 2014-04-05 17:05:06 -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
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
920a08412b Fixes #4689 
Rods can't break reinforced windows.
 2014-04-05 00:38:48 -04: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
Mike
efba89daff Corrected comments for CELLRATE and CHARGELEVEL 
Comments erroneously stated that a value of 0.002 would convert 1000
watts to 20 charge per tick, when in reality 1000*0.002 = 2 not 20.
Similarly for CHARGELEVEL.
 2014-04-02 23:48:48 -04:00
Mike
353941db7c APCs that are undersupplied now call cell.give() 
APCs that are undersupplied now call cell.give() instead of manipulating
cell.charge directly, for better encapsulation.
 2014-04-02 23:46:54 -04:00
Ccomp5950
78968de207 Merge pull request #4674 from Jarcolr/diction 
Fixes #4621
 2014-04-01 13:39:11 -05:00
Jarcolr
b33e9d0b92 Fixes #4621 
Shogun forgotten in time.
 2014-04-01 17:36:36 +03:00
Chinsky
0bf6708342 Merge pull request #4666 from Ccomp5950/apc_fix 
APC bugfix after someone messed with mah areas!
 2014-04-01 18:17:22 +04:00
Chinsky
26007716e4 Merge pull request #4660 from Jarcolr/patch-2 
Can no longer use fire extinguisher closet without hands
 2014-04-01 16:23:18 +04:00
Ccomp5950
6af132b834 APC bugfix after someone messed with mah areas! 
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.
 2014-04-01 03:06:58 -05:00
Jarcolr
231ecb6890 Cannot wash your missing hands anymore 
M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.
 2014-03-31 21:13:26 +03:00
Jarcolr
ffd4afa43d Also fixes paperbin without hands 
Whee.
 2014-03-31 18:48:57 +03:00
Jarcolr
cf42e348f0 Can no longer use fire extinguisher closet without hands 
If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating.
Cool,right?
 2014-03-31 18:19:25 +03:00
Chinsky
9227823e2c Merge pull request #4654 from Ccomp5950/Buff_NarSie 
Lagsie no more, NarSie HUNGERS
 2014-03-31 14:57:43 +04:00
DJSnapshot
19db97f9e2 Merge pull request #4650 from Ccomp5950/damn_boulders 
Oversight, miners can now bump mine boulders just like the rock around them
 2014-03-31 00:27:04 -07:00
DJSnapshot
8cb97330a7 Merge pull request #4657 from Baystation12/dev-freeze 
0.1.10 Staging [Standby]
 2014-03-30 16:57:01 -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
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
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
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
Chinsky
581cc2bfea Merge pull request #4640 from Glloyd/holo2 
Fixes Holodeck exploits (Fixed)
 2014-03-27 15:13:02 +03:00